diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ff600e824c..1283ffec084 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [next]
 
+- chore(): rename files to modern style [#8621](https://github.com/fabricjs/fabric.js/pull/8621)
 - chore(): move and rename text & itext files and organize as folders, rename mixins [#8620](https://github.com/fabricjs/fabric.js/pull/8620)
 - chore(TS): type IText, IText behavior, IText click behavior [#8610](https://github.com/fabricjs/fabric.js/pull/8610)
 - BREAKING: refactor `clone(obj, true)` with `cloneDeep(obj)` and remove all `extend`, `clone` calls in favor of object spreads. [#8600](https://github.com/fabricjs/fabric.js/pull/8600)
diff --git a/index.ts b/index.ts
index 55a1564021d..63c7a1c374b 100644
--- a/index.ts
+++ b/index.ts
@@ -1,13 +1,13 @@
 // FILTERS
-import { BaseFilter } from './src/filters/base_filter.class';
-import { BlendColor } from './src/filters/blendcolor_filter.class';
-import { BlendImage } from './src/filters/blendimage_filter.class';
-import { Blur } from './src/filters/blur_filter.class';
-import { Brightness } from './src/filters/brightness_filter.class';
-import { ColorMatrix } from './src/filters/colormatrix_filter.class';
-import { Composed } from './src/filters/composed_filter.class';
-import { Contrast } from './src/filters/contrast_filter.class';
-import { Convolute } from './src/filters/convolute_filter.class';
+import { BaseFilter } from './src/filters/BaseFilter';
+import { BlendColor } from './src/filters/BlendColor';
+import { BlendImage } from './src/filters/BlendImage';
+import { Blur } from './src/filters/Blur';
+import { Brightness } from './src/filters/Brightness';
+import { ColorMatrix } from './src/filters/ColorMatrix';
+import { Composed } from './src/filters/Composed';
+import { Contrast } from './src/filters/Contrast';
+import { Convolute } from './src/filters/Convolute';
 import {
   Sepia,
   Brownie,
@@ -16,17 +16,17 @@ import {
   Technicolor,
   Polaroid,
   BlackWhite,
-} from './src/filters/filter_generator';
-import { Gamma } from './src/filters/gamma_filter.class';
-import { Grayscale } from './src/filters/grayscale_filter.class';
-import { HueRotation } from './src/filters/hue_rotation.class';
-import { Invert } from './src/filters/invert_filter.class';
-import { Noise } from './src/filters/noise_filter.class';
-import { Pixelate } from './src/filters/pixelate_filter.class';
-import { RemoveColor } from './src/filters/removecolor_filter.class';
-import { Resize } from './src/filters/resize_filter.class';
-import { Saturation } from './src/filters/saturate_filter.class';
-import { Vibrance } from './src/filters/vibrance_filter.class';
+} from './src/filters/ColorMatrixFilters';
+import { Gamma } from './src/filters/Gamma';
+import { Grayscale } from './src/filters/Grayscale';
+import { HueRotation } from './src/filters/HueRotation';
+import { Invert } from './src/filters/Invert';
+import { Noise } from './src/filters/Noise';
+import { Pixelate } from './src/filters/Pixelate';
+import { RemoveColor } from './src/filters/RemoveColor';
+import { Resize } from './src/filters/Resize';
+import { Saturation } from './src/filters/Saturation';
+import { Vibrance } from './src/filters/Vibrance';
 
 const filters = {
   BaseFilter,
@@ -320,43 +320,43 @@ const controlsUtils = {
 
 import { cache } from './src/cache';
 import { VERSION as version, iMatrix } from './src/constants';
-import { StaticCanvas } from './src/canvas/static_canvas.class';
-import { Canvas } from './src/canvas/canvas_events';
+import { StaticCanvas } from './src/canvas/StaticCanvas';
+import { Canvas } from './src/canvas/Canvas';
 import { config } from './src/config';
 import { loadSVGFromURL } from './src/parser/loadSVGFromURL';
 import { loadSVGFromString } from './src/parser/loadSVGFromString';
 import { initFilterBackend } from './src/filters/FilterBackend';
-import { Canvas2dFilterBackend } from './src/filters/2d_backend.class';
-import { WebGLFilterBackend } from './src/filters/webgl_backend.class';
+import { Canvas2dFilterBackend } from './src/filters/Canvas2dFilterBackend';
+import { WebGLFilterBackend } from './src/filters/WebGLFilterBackend';
 import { runningAnimations } from './src/util/animation/AnimationRegistry';
 import { Observable } from './src/Observable';
-import { Point } from './src/point.class';
-import { Intersection } from './src/intersection.class';
-import { Color } from './src/color/color.class';
-import { Control } from './src/controls/control.class';
-import { Gradient } from './src/gradient/gradient.class';
-import { Pattern } from './src/pattern.class';
-import { Shadow } from './src/shadow.class';
-import { BaseBrush } from './src/brushes/base_brush.class';
-import { PencilBrush } from './src/brushes/pencil_brush.class';
-import { CircleBrush } from './src/brushes/circle_brush.class';
-import { SprayBrush } from './src/brushes/spray_brush.class';
-import { PatternBrush } from './src/brushes/pattern_brush.class';
+import { Point } from './src/Point';
+import { Intersection } from './src/Intersection';
+import { Color } from './src/color/Color';
+import { Control } from './src/controls/Control';
+import { Gradient } from './src/gradient/Gradient';
+import { Pattern } from './src/Pattern';
+import { Shadow } from './src/Shadow';
+import { BaseBrush } from './src/brushes/BaseBrush';
+import { PencilBrush } from './src/brushes/PencilBrush';
+import { CircleBrush } from './src/brushes/CircleBrush';
+import { SprayBrush } from './src/brushes/SprayBrush';
+import { PatternBrush } from './src/brushes/PatternBrush';
 import { FabricObject as Object } from './src/shapes/Object/FabricObject';
-import { Line } from './src/shapes/line.class';
-import { Circle } from './src/shapes/circle.class';
-import { Triangle } from './src/shapes/triangle.class';
-import { Ellipse } from './src/shapes/ellipse.class';
-import { Rect } from './src/shapes/rect.class';
-import { Path } from './src/shapes/path.class';
-import { Polyline } from './src/shapes/polyline.class';
-import { Polygon } from './src/shapes/polygon.class';
+import { Line } from './src/shapes/Line';
+import { Circle } from './src/shapes/Circle';
+import { Triangle } from './src/shapes/Triangle';
+import { Ellipse } from './src/shapes/Ellipse';
+import { Rect } from './src/shapes/Rect';
+import { Path } from './src/shapes/Path';
+import { Polyline } from './src/shapes/Polyline';
+import { Polygon } from './src/shapes/Polygon';
 import { Text } from './src/shapes/Text/Text';
 import { IText } from './src/shapes/IText/IText';
-import { Textbox } from './src/shapes/textbox.class';
-import { Group } from './src/shapes/group.class';
-import { ActiveSelection } from './src/shapes/active_selection.class';
-import { Image } from './src/shapes/image.class';
+import { Textbox } from './src/shapes/Textbox';
+import { Group } from './src/shapes/Group';
+import { ActiveSelection } from './src/shapes/ActiveSelection';
+import { Image } from './src/shapes/Image';
 import { getEnv, getDocument, getWindow, setEnvForTests } from './src/env';
 import { createCollectionMixin } from './src/Collection';
 import { parseAttributes } from './src/parser/parseAttributes';
diff --git a/src/EventTypeDefs.ts b/src/EventTypeDefs.ts
index ef0d4d2c911..33f7ce1d534 100644
--- a/src/EventTypeDefs.ts
+++ b/src/EventTypeDefs.ts
@@ -1,14 +1,14 @@
-import type { Control } from './controls/control.class';
-import type { Point } from './point.class';
+import type { Control } from './controls/Control';
+import type { Point } from './Point';
 import type { FabricObject } from './shapes/Object/FabricObject';
 import type { FabricObject as StaticFabricObject } from './shapes/Object/Object';
 import type { FabricObjectSVGExportMixin } from './shapes/Object/FabricObjectSVGExportMixin';
-import type { Group } from './shapes/group.class';
+import type { Group } from './shapes/Group';
 import type { TOriginX, TOriginY, TRadian } from './typedefs';
 import type { saveObjectTransform } from './util/misc/objectTransforms';
-import type { Canvas } from './canvas/canvas_events';
+import type { Canvas } from './canvas/Canvas';
 import type { IText } from './shapes/IText/IText';
-import type { StaticCanvas } from './canvas/static_canvas.class';
+import type { StaticCanvas } from './canvas/StaticCanvas';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars
 export interface BaseFabricObject
diff --git a/src/intersection.class.ts b/src/Intersection.ts
similarity index 99%
rename from src/intersection.class.ts
rename to src/Intersection.ts
index b131e02806a..566b9242713 100644
--- a/src/intersection.class.ts
+++ b/src/Intersection.ts
@@ -1,4 +1,4 @@
-import { Point } from './point.class';
+import { Point } from './Point';
 
 /* Adaptation of work of Kevin Lindsey (kevin@kevlindev.com) */
 
diff --git a/src/pattern.class.ts b/src/Pattern.ts
similarity index 100%
rename from src/pattern.class.ts
rename to src/Pattern.ts
diff --git a/src/point.class.ts b/src/Point.ts
similarity index 100%
rename from src/point.class.ts
rename to src/Point.ts
diff --git a/src/shadow.class.ts b/src/Shadow.ts
similarity index 98%
rename from src/shadow.class.ts
rename to src/Shadow.ts
index fc77c24b798..ca69abb1a66 100644
--- a/src/shadow.class.ts
+++ b/src/Shadow.ts
@@ -1,6 +1,6 @@
-import { Color } from './color/color.class';
+import { Color } from './color/Color';
 import { config } from './config';
-import { Point } from './point.class';
+import { Point } from './Point';
 import type { FabricObject } from './shapes/Object/FabricObject';
 import { TClassProperties } from './typedefs';
 import { uid } from './util/internals/uid';
diff --git a/src/brushes/base_brush.class.ts b/src/brushes/BaseBrush.ts
similarity index 95%
rename from src/brushes/base_brush.class.ts
rename to src/brushes/BaseBrush.ts
index 10fe73c24f5..44d2f28a02c 100644
--- a/src/brushes/base_brush.class.ts
+++ b/src/brushes/BaseBrush.ts
@@ -1,8 +1,8 @@
-import { Color } from '../color/color.class';
-import type { Point } from '../point.class';
+import { Color } from '../color/Color';
+import type { Point } from '../Point';
 import { TEvent } from '../EventTypeDefs';
-import type { Shadow } from '../shadow.class';
-import type { Canvas } from '../canvas/canvas_events';
+import type { Shadow } from '../Shadow';
+import type { Canvas } from '../canvas/Canvas';
 
 type TBrushEventData = TEvent & { pointer: Point };
 
diff --git a/src/brushes/circle_brush.class.ts b/src/brushes/CircleBrush.ts
similarity index 90%
rename from src/brushes/circle_brush.class.ts
rename to src/brushes/CircleBrush.ts
index 038eed1a091..e07bb0611ac 100644
--- a/src/brushes/circle_brush.class.ts
+++ b/src/brushes/CircleBrush.ts
@@ -1,11 +1,11 @@
-import { Color } from '../color/color.class';
-import { Point } from '../point.class';
-import { Shadow } from '../shadow.class';
-import { Circle } from '../shapes/circle.class';
-import { Group } from '../shapes/group.class';
+import { Color } from '../color/Color';
+import { Point } from '../Point';
+import { Shadow } from '../Shadow';
+import { Circle } from '../shapes/Circle';
+import { Group } from '../shapes/Group';
 import { getRandomInt } from '../util/internals';
-import type { Canvas } from '../canvas/canvas_events';
-import { BaseBrush } from './base_brush.class';
+import type { Canvas } from '../canvas/Canvas';
+import { BaseBrush } from './BaseBrush';
 
 export type CircleBrushPoint = {
   x: number;
diff --git a/src/brushes/pattern_brush.class.ts b/src/brushes/PatternBrush.ts
similarity index 91%
rename from src/brushes/pattern_brush.class.ts
rename to src/brushes/PatternBrush.ts
index ceeeea556ca..eda0b691e5b 100644
--- a/src/brushes/pattern_brush.class.ts
+++ b/src/brushes/PatternBrush.ts
@@ -1,8 +1,8 @@
-import { Pattern } from '../pattern.class';
+import { Pattern } from '../Pattern';
 import { PathData } from '../typedefs';
 import { createCanvasElement } from '../util/misc/dom';
-import type { Canvas } from '../canvas/canvas_events';
-import { PencilBrush } from './pencil_brush.class';
+import type { Canvas } from '../canvas/Canvas';
+import { PencilBrush } from './PencilBrush';
 
 export class PatternBrush extends PencilBrush {
   declare source?: CanvasImageSource;
diff --git a/src/brushes/pencil_brush.class.ts b/src/brushes/PencilBrush.ts
similarity index 97%
rename from src/brushes/pencil_brush.class.ts
rename to src/brushes/PencilBrush.ts
index a02141c5e9a..3f8f5768932 100644
--- a/src/brushes/pencil_brush.class.ts
+++ b/src/brushes/PencilBrush.ts
@@ -1,11 +1,11 @@
 import { ModifierKey, TEvent } from '../EventTypeDefs';
-import { Point } from '../point.class';
-import { Shadow } from '../shadow.class';
-import { Path } from '../shapes/path.class';
+import { Point } from '../Point';
+import { Shadow } from '../Shadow';
+import { Path } from '../shapes/Path';
 import { PathData } from '../typedefs';
 import { getSmoothPathFromPoints, joinPath } from '../util/path';
-import type { Canvas } from '../canvas/canvas_events';
-import { BaseBrush } from './base_brush.class';
+import type { Canvas } from '../canvas/Canvas';
+import { BaseBrush } from './BaseBrush';
 
 /**
  * @private
diff --git a/src/brushes/spray_brush.class.ts b/src/brushes/SprayBrush.ts
similarity index 94%
rename from src/brushes/spray_brush.class.ts
rename to src/brushes/SprayBrush.ts
index 89f97e61f54..5ce364dd36c 100644
--- a/src/brushes/spray_brush.class.ts
+++ b/src/brushes/SprayBrush.ts
@@ -1,10 +1,10 @@
-import { Point } from '../point.class';
-import { Group } from '../shapes/group.class';
-import { Shadow } from '../shadow.class';
-import { Rect } from '../shapes/rect.class';
+import { Point } from '../Point';
+import { Group } from '../shapes/Group';
+import { Shadow } from '../Shadow';
+import { Rect } from '../shapes/Rect';
 import { getRandomInt } from '../util/internals';
-import type { Canvas } from '../canvas/canvas_events';
-import { BaseBrush } from './base_brush.class';
+import type { Canvas } from '../canvas/Canvas';
+import { BaseBrush } from './BaseBrush';
 
 export type SprayBrushPoint = {
   x: number;
diff --git a/src/canvas/canvas_events.ts b/src/canvas/Canvas.ts
similarity index 99%
rename from src/canvas/canvas_events.ts
rename to src/canvas/Canvas.ts
index 6b884ee9133..51b7ab5eb09 100644
--- a/src/canvas/canvas_events.ts
+++ b/src/canvas/Canvas.ts
@@ -9,9 +9,9 @@ import {
   TPointerEventNames,
   Transform,
 } from '../EventTypeDefs';
-import { Point } from '../point.class';
-import { ActiveSelection } from '../shapes/active_selection.class';
-import { Group } from '../shapes/group.class';
+import { Point } from '../Point';
+import { ActiveSelection } from '../shapes/ActiveSelection';
+import { Group } from '../shapes/Group';
 import type { FabricObject } from '../shapes/Object/FabricObject';
 import { AssertKeys } from '../typedefs';
 import { isTouchEvent, stopEvent } from '../util/dom_event';
@@ -22,7 +22,7 @@ import {
   isFabricObjectWithDragSupport,
   isInteractiveTextObject,
 } from '../util/types';
-import { SelectableCanvas } from './canvas.class';
+import { SelectableCanvas } from './SelectableCanvas';
 import { TextEditingManager } from './TextEditingManager';
 
 const addEventOptions = { passive: false } as EventListenerOptions;
diff --git a/src/canvas/canvas.class.ts b/src/canvas/SelectableCanvas.ts
similarity index 99%
rename from src/canvas/canvas.class.ts
rename to src/canvas/SelectableCanvas.ts
index e0a9ddf5cd0..5e047a8e7cc 100644
--- a/src/canvas/canvas.class.ts
+++ b/src/canvas/SelectableCanvas.ts
@@ -1,7 +1,7 @@
 import { getEnv } from '../env';
 import { dragHandler } from '../controls/drag';
 import { getActionFromCorner } from '../controls/util';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import { FabricObject } from '../shapes/Object/FabricObject';
 import {
   CanvasEvents,
@@ -14,7 +14,7 @@ import {
   addTransformToObject,
   saveObjectTransform,
 } from '../util/misc/objectTransforms';
-import { StaticCanvas, TCanvasSizeOptions } from './static_canvas.class';
+import { StaticCanvas, TCanvasSizeOptions } from './StaticCanvas';
 import {
   isActiveSelection,
   isCollection,
@@ -22,13 +22,7 @@ import {
 } from '../util/types';
 import { invertTransform, transformPoint } from '../util/misc/matrix';
 import { isTransparent } from '../util/misc/isTransparent';
-import {
-  TMat2D,
-  TOriginX,
-  TOriginY,
-  TSize,
-  TToCanvasElementOptions,
-} from '../typedefs';
+import { TMat2D, TOriginX, TOriginY, TSize } from '../typedefs';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
 import { getPointer, isTouchEvent } from '../util/dom_event';
 import type { IText } from '../shapes/IText/IText';
@@ -38,7 +32,7 @@ import {
   wrapElement,
 } from '../util/dom_misc';
 import { setStyle } from '../util/dom_style';
-import type { BaseBrush } from '../brushes/base_brush.class';
+import type { BaseBrush } from '../brushes/BaseBrush';
 import { pick } from '../util/misc/pick';
 import { TSVGReviver } from '../typedefs';
 import { sendPointToPlane } from '../util/misc/planeChange';
diff --git a/src/canvas/static_canvas.class.ts b/src/canvas/StaticCanvas.ts
similarity index 99%
rename from src/canvas/static_canvas.class.ts
rename to src/canvas/StaticCanvas.ts
index 34985109142..26cb3530a82 100644
--- a/src/canvas/static_canvas.class.ts
+++ b/src/canvas/StaticCanvas.ts
@@ -2,14 +2,14 @@ import { getEnv } from '../env';
 import { config } from '../config';
 import { iMatrix, VERSION } from '../constants';
 import type { CanvasEvents, StaticCanvasEvents } from '../EventTypeDefs';
-import type { Gradient } from '../gradient/gradient.class';
+import type { Gradient } from '../gradient/Gradient';
 import { createCollectionMixin } from '../Collection';
 import { CommonMethods } from '../CommonMethods';
-import type { Pattern } from '../pattern.class';
-import { Point } from '../point.class';
+import type { Pattern } from '../Pattern';
+import { Point } from '../Point';
 import type { BaseFabricObject as FabricObject } from '../EventTypeDefs';
 import type { TCachedFabricObject } from '../shapes/Object/Object';
-import type { Rect } from '../shapes/rect.class';
+import type { Rect } from '../shapes/Rect';
 import {
   ImageFormat,
   TCornerPoint,
diff --git a/src/canvas/canvas_gestures.mixin.ts b/src/canvas/canvas_gestures.mixin.ts
index 96884413f56..344e023e8c7 100644
--- a/src/canvas/canvas_gestures.mixin.ts
+++ b/src/canvas/canvas_gestures.mixin.ts
@@ -6,7 +6,7 @@ import {
   degreesToRadians,
   radiansToDegrees,
 } from '../util/misc/radiansDegreesConversion';
-import { Canvas } from './canvas_events';
+import { Canvas } from './Canvas';
 
 /**
  * Adds support for multi-touch gestures using the Event.js library.
diff --git a/src/color/color.class.ts b/src/color/Color.ts
similarity index 100%
rename from src/color/color.class.ts
rename to src/color/Color.ts
diff --git a/src/controls/control.class.ts b/src/controls/Control.ts
similarity index 99%
rename from src/controls/control.class.ts
rename to src/controls/Control.ts
index 448b1298a53..93a30827747 100644
--- a/src/controls/control.class.ts
+++ b/src/controls/Control.ts
@@ -5,7 +5,7 @@ import {
   TPointerEvent,
   TransformActionHandler,
 } from '../EventTypeDefs';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import type { FabricObject } from '../shapes/Object/Object';
 import { TDegree, TMat2D } from '../typedefs';
 import { cos } from '../util/misc/cos';
diff --git a/src/controls/controls.render.ts b/src/controls/controls.render.ts
index 6dcd29aaf59..9da23bc38d9 100644
--- a/src/controls/controls.render.ts
+++ b/src/controls/controls.render.ts
@@ -1,7 +1,7 @@
 import { twoMathPi } from '../constants';
 import type { FabricObject } from '../shapes/Object/Object';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
-import type { Control } from './control.class';
+import type { Control } from './Control';
 
 export type ControlRenderingStyleOverride = Partial<
   Pick<
diff --git a/src/controls/default_controls.ts b/src/controls/default_controls.ts
index 6f2bf42c922..f6ffd17bf48 100644
--- a/src/controls/default_controls.ts
+++ b/src/controls/default_controls.ts
@@ -1,5 +1,5 @@
 import { FabricObject } from '../shapes/Object/FabricObject';
-import { Textbox } from '../shapes/textbox.class';
+import { Textbox } from '../shapes/Textbox';
 import { scaleCursorStyleHandler, scalingEqually } from './scale';
 import { changeWidth } from './changeWidth';
 import { rotationStyleHandler, rotationWithSnapping } from './rotate';
@@ -9,7 +9,7 @@ import {
   scalingXOrSkewingY,
   scalingYOrSkewingX,
 } from './scaleSkew';
-import { Control } from './control.class';
+import { Control } from './Control';
 
 // use this function if you want to generate new controls for every instance
 export const createObjectDefaultControls = () => ({
diff --git a/src/controls/polyControl.ts b/src/controls/polyControl.ts
index c2d4df2b605..2f54780371f 100644
--- a/src/controls/polyControl.ts
+++ b/src/controls/polyControl.ts
@@ -1,8 +1,8 @@
-import { Point } from '../point.class';
-import { Control } from './control.class';
+import { Point } from '../Point';
+import { Control } from './Control';
 import { TMat2D } from '../typedefs';
 import { iMatrix } from '../constants';
-import type { Polyline } from '../shapes/polyline.class';
+import type { Polyline } from '../shapes/Polyline';
 import { multiplyTransformMatrices } from '../util/misc/matrix';
 import {
   TPointerEvent,
diff --git a/src/controls/scale.ts b/src/controls/scale.ts
index 5beffd93570..f75444cf0ff 100644
--- a/src/controls/scale.ts
+++ b/src/controls/scale.ts
@@ -6,7 +6,7 @@ import {
 } from '../EventTypeDefs';
 import type { FabricObject } from '../shapes/Object/FabricObject';
 import { TAxis } from '../typedefs';
-import type { Canvas } from '../canvas/canvas_events';
+import type { Canvas } from '../canvas/Canvas';
 import {
   findCornerQuadrant,
   getLocalPoint,
diff --git a/src/controls/skew.ts b/src/controls/skew.ts
index e7c377009c1..14aef88d158 100644
--- a/src/controls/skew.ts
+++ b/src/controls/skew.ts
@@ -5,7 +5,7 @@ import {
   TransformActionHandler,
 } from '../EventTypeDefs';
 import { resolveOrigin } from '../util/misc/resolveOrigin';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import { TAxis, TAxisKey } from '../typedefs';
 import {
   degreesToRadians,
diff --git a/src/controls/util.ts b/src/controls/util.ts
index d692feecf0f..76f889931a1 100644
--- a/src/controls/util.ts
+++ b/src/controls/util.ts
@@ -5,14 +5,14 @@ import {
   BasicTransformEvent,
 } from '../EventTypeDefs';
 import { resolveOrigin } from '../util/misc/resolveOrigin';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import type { FabricObject } from '../shapes/Object/FabricObject';
 import { TOriginX, TOriginY } from '../typedefs';
 import {
   degreesToRadians,
   radiansToDegrees,
 } from '../util/misc/radiansDegreesConversion';
-import type { Control } from './control.class';
+import type { Control } from './Control';
 
 export const NOT_ALLOWED_CURSOR = 'not-allowed';
 
diff --git a/src/filters/base_filter.class.ts b/src/filters/BaseFilter.ts
similarity index 100%
rename from src/filters/base_filter.class.ts
rename to src/filters/BaseFilter.ts
diff --git a/src/filters/blendcolor_filter.class.ts b/src/filters/BlendColor.ts
similarity index 98%
rename from src/filters/blendcolor_filter.class.ts
rename to src/filters/BlendColor.ts
index b6f018c4a48..db96c92f38e 100644
--- a/src/filters/blendcolor_filter.class.ts
+++ b/src/filters/BlendColor.ts
@@ -1,6 +1,6 @@
-import { Color } from '../color/color.class';
+import { Color } from '../color/Color';
 import { TClassProperties } from '../typedefs';
-import { AbstractBaseFilter } from './base_filter.class';
+import { AbstractBaseFilter } from './BaseFilter';
 import { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/blendimage_filter.class.ts b/src/filters/BlendImage.ts
similarity index 97%
rename from src/filters/blendimage_filter.class.ts
rename to src/filters/BlendImage.ts
index 16a85e4c4aa..8f17214b2b6 100644
--- a/src/filters/blendimage_filter.class.ts
+++ b/src/filters/BlendImage.ts
@@ -1,13 +1,13 @@
-import { Image } from '../shapes/image.class';
+import { Image } from '../shapes/Image';
 import type { TClassProperties } from '../typedefs';
 import { createCanvasElement } from '../util/misc/dom';
-import { AbstractBaseFilter } from './base_filter.class';
+import { AbstractBaseFilter } from './BaseFilter';
 import type {
   T2DPipelineState,
   TWebGLPipelineState,
   TWebGLUniformLocationMap,
 } from './typedefs';
-import { WebGLFilterBackend } from './webgl_backend.class';
+import { WebGLFilterBackend } from './WebGLFilterBackend';
 import { classRegistry } from '../util/class_registry';
 
 /**
diff --git a/src/filters/blur_filter.class.ts b/src/filters/Blur.ts
similarity index 99%
rename from src/filters/blur_filter.class.ts
rename to src/filters/Blur.ts
index c5c5e5280ed..6312cb37243 100644
--- a/src/filters/blur_filter.class.ts
+++ b/src/filters/Blur.ts
@@ -1,6 +1,6 @@
 import type { TClassProperties } from '../typedefs';
 import { createCanvasElement } from '../util/misc/dom';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type {
   TWebGLPipelineState,
   T2DPipelineState,
diff --git a/src/filters/filter_boilerplate.ts b/src/filters/Boilerplate.ts
similarity index 98%
rename from src/filters/filter_boilerplate.ts
rename to src/filters/Boilerplate.ts
index 4d27eb9b07c..52f389274ac 100644
--- a/src/filters/filter_boilerplate.ts
+++ b/src/filters/Boilerplate.ts
@@ -1,5 +1,5 @@
 import { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 
 /**
diff --git a/src/filters/brightness_filter.class.ts b/src/filters/Brightness.ts
similarity index 98%
rename from src/filters/brightness_filter.class.ts
rename to src/filters/Brightness.ts
index 51a213a2595..48c280b7f7e 100644
--- a/src/filters/brightness_filter.class.ts
+++ b/src/filters/Brightness.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 /**
diff --git a/src/filters/2d_backend.class.ts b/src/filters/Canvas2dFilterBackend.ts
similarity index 97%
rename from src/filters/2d_backend.class.ts
rename to src/filters/Canvas2dFilterBackend.ts
index 74f6579fa15..454e528f68d 100644
--- a/src/filters/2d_backend.class.ts
+++ b/src/filters/Canvas2dFilterBackend.ts
@@ -1,7 +1,7 @@
 /**
  * Canvas 2D filter backend.
  */
-import type { BaseFilter } from './base_filter.class';
+import type { BaseFilter } from './BaseFilter';
 import { T2DPipelineState, TPipelineResources } from './typedefs';
 
 export class Canvas2dFilterBackend {
diff --git a/src/filters/colormatrix_filter.class.ts b/src/filters/ColorMatrix.ts
similarity index 98%
rename from src/filters/colormatrix_filter.class.ts
rename to src/filters/ColorMatrix.ts
index 02be7faa195..d94ede5f391 100644
--- a/src/filters/colormatrix_filter.class.ts
+++ b/src/filters/ColorMatrix.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 /**
diff --git a/src/filters/filter_generator.ts b/src/filters/ColorMatrixFilters.ts
similarity index 97%
rename from src/filters/filter_generator.ts
rename to src/filters/ColorMatrixFilters.ts
index 42b5eb148e6..8734f87f701 100644
--- a/src/filters/filter_generator.ts
+++ b/src/filters/ColorMatrixFilters.ts
@@ -1,4 +1,4 @@
-import { ColorMatrix } from './colormatrix_filter.class';
+import { ColorMatrix } from './ColorMatrix';
 import { classRegistry } from '../util/class_registry';
 
 export function createColorMatrixFilter(key: string, matrix: number[]) {
diff --git a/src/filters/composed_filter.class.ts b/src/filters/Composed.ts
similarity index 98%
rename from src/filters/composed_filter.class.ts
rename to src/filters/Composed.ts
index 08cedcf2660..f66862204b1 100644
--- a/src/filters/composed_filter.class.ts
+++ b/src/filters/Composed.ts
@@ -3,7 +3,7 @@ import {
   type AnyFilter,
   BaseFilter,
   type BaseFilterOptions,
-} from './base_filter.class';
+} from './BaseFilter';
 import type { T2DPipelineState, TWebGLPipelineState } from './typedefs';
 import { isWebGLPipelineState } from './typedefs';
 import { classRegistry } from '../util/class_registry';
diff --git a/src/filters/contrast_filter.class.ts b/src/filters/Contrast.ts
similarity index 98%
rename from src/filters/contrast_filter.class.ts
rename to src/filters/Contrast.ts
index 6b3c4dc0d13..26edbba122b 100644
--- a/src/filters/contrast_filter.class.ts
+++ b/src/filters/Contrast.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/convolute_filter.class.ts b/src/filters/Convolute.ts
similarity index 99%
rename from src/filters/convolute_filter.class.ts
rename to src/filters/Convolute.ts
index 70b0142d9c2..515bcd37345 100644
--- a/src/filters/convolute_filter.class.ts
+++ b/src/filters/Convolute.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { AbstractBaseFilter } from './base_filter.class';
+import { AbstractBaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/FilterBackend.ts b/src/filters/FilterBackend.ts
index d0ad076ae70..649b3def2f2 100644
--- a/src/filters/FilterBackend.ts
+++ b/src/filters/FilterBackend.ts
@@ -1,6 +1,6 @@
 import { config } from '../config';
-import { Canvas2dFilterBackend } from './2d_backend.class';
-import { WebGLFilterBackend } from './webgl_backend.class';
+import { Canvas2dFilterBackend } from './Canvas2dFilterBackend';
+import { WebGLFilterBackend } from './WebGLFilterBackend';
 import { webGLProbe } from './WebGLProbe';
 
 export type FilterBackend = WebGLFilterBackend | Canvas2dFilterBackend;
diff --git a/src/filters/gamma_filter.class.ts b/src/filters/Gamma.ts
similarity index 98%
rename from src/filters/gamma_filter.class.ts
rename to src/filters/Gamma.ts
index 25212b95ab3..475a9f22f9e 100644
--- a/src/filters/gamma_filter.class.ts
+++ b/src/filters/Gamma.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter, BaseFilterOptions } from './base_filter.class';
+import { BaseFilter, BaseFilterOptions } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/grayscale_filter.class.ts b/src/filters/Grayscale.ts
similarity index 98%
rename from src/filters/grayscale_filter.class.ts
rename to src/filters/Grayscale.ts
index 3a72d1bcf00..d9a2e3a50ca 100644
--- a/src/filters/grayscale_filter.class.ts
+++ b/src/filters/Grayscale.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { AbstractBaseFilter } from './base_filter.class';
+import { AbstractBaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/hue_rotation.class.ts b/src/filters/HueRotation.ts
similarity index 97%
rename from src/filters/hue_rotation.class.ts
rename to src/filters/HueRotation.ts
index 79027bc8b30..19126b93c41 100644
--- a/src/filters/hue_rotation.class.ts
+++ b/src/filters/HueRotation.ts
@@ -1,7 +1,7 @@
 import type { TClassProperties } from '../typedefs';
 import { cos } from '../util/misc/cos';
 import { sin } from '../util/misc/sin';
-import { ColorMatrix } from './colormatrix_filter.class';
+import { ColorMatrix } from './ColorMatrix';
 import type { TWebGLPipelineState, T2DPipelineState } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/invert_filter.class.ts b/src/filters/Invert.ts
similarity index 98%
rename from src/filters/invert_filter.class.ts
rename to src/filters/Invert.ts
index 5544b5cf31c..bb7313af451 100644
--- a/src/filters/invert_filter.class.ts
+++ b/src/filters/Invert.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/noise_filter.class.ts b/src/filters/Noise.ts
similarity index 98%
rename from src/filters/noise_filter.class.ts
rename to src/filters/Noise.ts
index a9ecd292a28..729855f9761 100644
--- a/src/filters/noise_filter.class.ts
+++ b/src/filters/Noise.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/pixelate_filter.class.ts b/src/filters/Pixelate.ts
similarity index 98%
rename from src/filters/pixelate_filter.class.ts
rename to src/filters/Pixelate.ts
index 0c4108b22c2..4ceef5794b8 100644
--- a/src/filters/pixelate_filter.class.ts
+++ b/src/filters/Pixelate.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/removecolor_filter.class.ts b/src/filters/RemoveColor.ts
similarity index 97%
rename from src/filters/removecolor_filter.class.ts
rename to src/filters/RemoveColor.ts
index e34ba3e71c9..c0d9cd29044 100644
--- a/src/filters/removecolor_filter.class.ts
+++ b/src/filters/RemoveColor.ts
@@ -1,6 +1,6 @@
-import { Color } from '../color/color.class';
+import { Color } from '../color/Color';
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/resize_filter.class.ts b/src/filters/Resize.ts
similarity index 99%
rename from src/filters/resize_filter.class.ts
rename to src/filters/Resize.ts
index bb9987a6bad..4d41c321f81 100644
--- a/src/filters/resize_filter.class.ts
+++ b/src/filters/Resize.ts
@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { getEnv } from '../env';
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLPipelineState } from './typedefs';
 import { isWebGLPipelineState } from './typedefs';
 import { classRegistry } from '../util/class_registry';
diff --git a/src/filters/saturate_filter.class.ts b/src/filters/Saturation.ts
similarity index 98%
rename from src/filters/saturate_filter.class.ts
rename to src/filters/Saturation.ts
index 8a390877c38..5abd09a2fa3 100644
--- a/src/filters/saturate_filter.class.ts
+++ b/src/filters/Saturation.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/vibrance_filter.class.ts b/src/filters/Vibrance.ts
similarity index 98%
rename from src/filters/vibrance_filter.class.ts
rename to src/filters/Vibrance.ts
index 0ac78018033..f91bf7704b0 100644
--- a/src/filters/vibrance_filter.class.ts
+++ b/src/filters/Vibrance.ts
@@ -1,5 +1,5 @@
 import type { TClassProperties } from '../typedefs';
-import { BaseFilter } from './base_filter.class';
+import { BaseFilter } from './BaseFilter';
 import type { T2DPipelineState, TWebGLUniformLocationMap } from './typedefs';
 import { classRegistry } from '../util/class_registry';
 
diff --git a/src/filters/webgl_backend.class.ts b/src/filters/WebGLFilterBackend.ts
similarity index 100%
rename from src/filters/webgl_backend.class.ts
rename to src/filters/WebGLFilterBackend.ts
diff --git a/src/filters/typedefs.ts b/src/filters/typedefs.ts
index da515966d23..56d9c276bc3 100644
--- a/src/filters/typedefs.ts
+++ b/src/filters/typedefs.ts
@@ -1,5 +1,5 @@
-import type { WebGLFilterBackend } from './webgl_backend.class';
-import type { Canvas2dFilterBackend } from './2d_backend.class';
+import type { WebGLFilterBackend } from './WebGLFilterBackend';
+import type { Canvas2dFilterBackend } from './Canvas2dFilterBackend';
 
 export type TProgramCache = any;
 
diff --git a/src/gradient/gradient.class.ts b/src/gradient/Gradient.ts
similarity index 99%
rename from src/gradient/gradient.class.ts
rename to src/gradient/Gradient.ts
index 282b6cf5f7c..c119c357f70 100644
--- a/src/gradient/gradient.class.ts
+++ b/src/gradient/Gradient.ts
@@ -1,5 +1,5 @@
 //@ts-nocheck
-import { Color } from '../color/color.class';
+import { Color } from '../color/Color';
 import { iMatrix } from '../constants';
 import { parseTransformAttribute } from '../parser/parseTransformAttribute';
 import type { FabricObject } from '../shapes/Object/FabricObject';
diff --git a/src/gradient/parser/parseColorStops.ts b/src/gradient/parser/parseColorStops.ts
index ce0fd0a40a0..0e6cd75e62e 100644
--- a/src/gradient/parser/parseColorStops.ts
+++ b/src/gradient/parser/parseColorStops.ts
@@ -1,4 +1,4 @@
-import { Color } from '../../color/color.class';
+import { Color } from '../../color/Color';
 import { parsePercent } from '../../parser/percent';
 import { ifNaN } from '../../util/internals';
 
diff --git a/src/mixins/eraser_brush.mixin.ts b/src/mixins/eraser_brush.mixin.ts
index 19dfb33311e..05d352cdb7e 100644
--- a/src/mixins/eraser_brush.mixin.ts
+++ b/src/mixins/eraser_brush.mixin.ts
@@ -1,5 +1,5 @@
 //@ts-nocheck
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import { uid } from '../util/internals/uid';
 
 (function (global) {
diff --git a/src/parkinglot/canvas_animation.mixin.ts b/src/parkinglot/canvas_animation.mixin.ts
index ab09ae96616..143be169893 100644
--- a/src/parkinglot/canvas_animation.mixin.ts
+++ b/src/parkinglot/canvas_animation.mixin.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 
-import { StaticCanvas } from '../canvas/static_canvas.class';
+import { StaticCanvas } from '../canvas/StaticCanvas';
 import { animate } from '../util/animation/animate';
 
 Object.assign(StaticCanvas.prototype, {
diff --git a/src/parser/elements_parser.ts b/src/parser/elements_parser.ts
index a02c2136bf2..f0748cd0384 100644
--- a/src/parser/elements_parser.ts
+++ b/src/parser/elements_parser.ts
@@ -1,7 +1,7 @@
 //@ts-nocheck
-import { Gradient } from '../gradient/gradient.class';
-import { Group } from '../shapes/group.class';
-import { Image } from '../shapes/image.class';
+import { Gradient } from '../gradient/Gradient';
+import { Group } from '../shapes/Group';
+import { Image } from '../shapes/Image';
 import { classRegistry } from '../util/class_registry';
 import {
   invertTransform,
diff --git a/src/parser/setStrokeFillOpacity.ts b/src/parser/setStrokeFillOpacity.ts
index 659ef29c6c8..a2865219623 100644
--- a/src/parser/setStrokeFillOpacity.ts
+++ b/src/parser/setStrokeFillOpacity.ts
@@ -1,5 +1,5 @@
 //@ts-nocheck
-import { Color } from '../color/color.class';
+import { Color } from '../color/Color';
 import { toFixed } from '../util/misc/toFixed';
 import { colorAttributes } from './constants';
 import { FabricObject } from '../shapes/Object/FabricObject';
diff --git a/src/shapes/active_selection.class.ts b/src/shapes/ActiveSelection.ts
similarity index 99%
rename from src/shapes/active_selection.class.ts
rename to src/shapes/ActiveSelection.ts
index 42fd420ce4c..c7161931b0b 100644
--- a/src/shapes/active_selection.class.ts
+++ b/src/shapes/ActiveSelection.ts
@@ -1,7 +1,7 @@
 import { ControlRenderingStyleOverride } from '../controls/controls.render';
 import { TClassProperties } from '../typedefs';
 import { classRegistry } from '../util/class_registry';
-import { Group } from './group.class';
+import { Group } from './Group';
 import type { FabricObject } from './Object/FabricObject';
 
 export class ActiveSelection extends Group {
diff --git a/src/shapes/circle.class.ts b/src/shapes/Circle.ts
similarity index 100%
rename from src/shapes/circle.class.ts
rename to src/shapes/Circle.ts
diff --git a/src/shapes/ellipse.class.ts b/src/shapes/Ellipse.ts
similarity index 100%
rename from src/shapes/ellipse.class.ts
rename to src/shapes/Ellipse.ts
diff --git a/src/shapes/group.class.ts b/src/shapes/Group.ts
similarity index 99%
rename from src/shapes/group.class.ts
rename to src/shapes/Group.ts
index 7b38e8f9739..e4f9659ea16 100644
--- a/src/shapes/group.class.ts
+++ b/src/shapes/Group.ts
@@ -2,7 +2,7 @@
 import type { CollectionEvents, ObjectEvents } from '../EventTypeDefs';
 import { createCollectionMixin } from '../Collection';
 import { resolveOrigin } from '../util/misc/resolveOrigin';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import type { TClassProperties } from '../typedefs';
 import { cos } from '../util/misc/cos';
 import {
@@ -18,7 +18,7 @@ import { applyTransformToObject } from '../util/misc/objectTransforms';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
 import { sin } from '../util/misc/sin';
 import { FabricObject, stateProperties } from './Object/FabricObject';
-import { Rect } from './rect.class';
+import { Rect } from './Rect';
 import { classRegistry } from '../util/class_registry';
 
 export type LayoutContextType =
diff --git a/src/shapes/IText/DraggableTextDelegate.ts b/src/shapes/IText/DraggableTextDelegate.ts
index 581d1395549..7c351de6b4a 100644
--- a/src/shapes/IText/DraggableTextDelegate.ts
+++ b/src/shapes/IText/DraggableTextDelegate.ts
@@ -1,11 +1,11 @@
-import type { Canvas } from '../../canvas/canvas_events';
+import type { Canvas } from '../../canvas/Canvas';
 import { getEnv } from '../../env';
 import {
   DragEventData,
   DropEventData,
   TPointerEvent,
 } from '../../EventTypeDefs';
-import { Point } from '../../point.class';
+import { Point } from '../../Point';
 import type { IText } from './IText';
 import { setStyle } from '../../util/dom_style';
 import { cloneDeep } from '../../util/internals/cloneDeep';
diff --git a/src/shapes/IText/IText.ts b/src/shapes/IText/IText.ts
index 4904267b05a..9f6d4889159 100644
--- a/src/shapes/IText/IText.ts
+++ b/src/shapes/IText/IText.ts
@@ -1,4 +1,4 @@
-import { Canvas } from '../../canvas/canvas_events';
+import { Canvas } from '../../canvas/Canvas';
 import { ITextEvents } from './ITextBehavior';
 import { ITextClickBehavior } from './ITextClickBehavior';
 import {
diff --git a/src/shapes/IText/ITextBehavior.ts b/src/shapes/IText/ITextBehavior.ts
index 7dd637411b7..ee70fa6a74b 100644
--- a/src/shapes/IText/ITextBehavior.ts
+++ b/src/shapes/IText/ITextBehavior.ts
@@ -4,7 +4,7 @@ import {
   TPointerEvent,
   TPointerEventInfo,
 } from '../../EventTypeDefs';
-import { Point } from '../../point.class';
+import { Point } from '../../Point';
 import type { FabricObject } from '../Object/Object';
 import { Text } from '../Text/Text';
 import { animate } from '../../util/animation/animate';
diff --git a/src/shapes/IText/ITextClickBehavior.ts b/src/shapes/IText/ITextClickBehavior.ts
index 6c86e6da2df..dbc6b7f2def 100644
--- a/src/shapes/IText/ITextClickBehavior.ts
+++ b/src/shapes/IText/ITextClickBehavior.ts
@@ -1,5 +1,5 @@
 import type { TPointerEvent, TPointerEventInfo } from '../../EventTypeDefs';
-import { IPoint, Point } from '../../point.class';
+import { IPoint, Point } from '../../Point';
 import type { DragMethods } from '../Object/InteractiveObject';
 import { stopEvent } from '../../util/dom_event';
 import { invertTransform, transformPoint } from '../../util/misc/matrix';
diff --git a/src/shapes/image.class.ts b/src/shapes/Image.ts
similarity index 99%
rename from src/shapes/image.class.ts
rename to src/shapes/Image.ts
index 346b2eb6b51..99e07340f70 100644
--- a/src/shapes/image.class.ts
+++ b/src/shapes/Image.ts
@@ -1,6 +1,6 @@
 //@ts-nocheck
 import { getEnv } from '../env';
-import type { BaseFilter } from '../filters/base_filter.class';
+import type { BaseFilter } from '../filters/BaseFilter';
 import { getFilterBackend } from '../filters/FilterBackend';
 import { SHARED_ATTRIBUTES } from '../parser/attributes';
 import { parseAttributes } from '../parser/parseAttributes';
diff --git a/src/shapes/line.class.ts b/src/shapes/Line.ts
similarity index 99%
rename from src/shapes/line.class.ts
rename to src/shapes/Line.ts
index 4a2ecc053e6..dbb85cf4d8e 100644
--- a/src/shapes/line.class.ts
+++ b/src/shapes/Line.ts
@@ -3,7 +3,7 @@ import { parseAttributes } from '../parser/parseAttributes';
 import { TClassProperties } from '../typedefs';
 import { classRegistry } from '../util/class_registry';
 import { FabricObject, cacheProperties } from './Object/FabricObject';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import { isFiller } from '../util/types';
 
 // @TODO this code is terrible and Line should be a special case of polyline.
diff --git a/src/shapes/Object/AnimatableObject.ts b/src/shapes/Object/AnimatableObject.ts
index f2c30127829..c81f449bc0e 100644
--- a/src/shapes/Object/AnimatableObject.ts
+++ b/src/shapes/Object/AnimatableObject.ts
@@ -1,4 +1,4 @@
-import { TColorArg } from '../../color/color.class';
+import { TColorArg } from '../../color/Color';
 import { ObjectEvents } from '../../EventTypeDefs';
 import {
   animate,
diff --git a/src/shapes/Object/InteractiveObject.ts b/src/shapes/Object/InteractiveObject.ts
index ac437a9fa69..1d4265285a0 100644
--- a/src/shapes/Object/InteractiveObject.ts
+++ b/src/shapes/Object/InteractiveObject.ts
@@ -1,4 +1,4 @@
-import { Point } from '../../point.class';
+import { Point } from '../../Point';
 import type { AssertKeys, TCornerPoint, TDegree, TMat2D } from '../../typedefs';
 import { FabricObject } from './Object';
 import { degreesToRadians } from '../../util/misc/radiansDegreesConversion';
@@ -8,10 +8,10 @@ import {
   qrDecompose,
   TQrDecomposeOut,
 } from '../../util/misc/matrix';
-import type { Control } from '../../controls/control.class';
+import type { Control } from '../../controls/Control';
 import { sizeAfterTransform } from '../../util/misc/objectTransforms';
 import { ObjectEvents, TPointerEvent } from '../../EventTypeDefs';
-import type { Canvas } from '../../canvas/canvas_events';
+import type { Canvas } from '../../canvas/Canvas';
 import type { ControlRenderingStyleOverride } from '../../controls/controls.render';
 
 type TOCoord = Point & {
diff --git a/src/shapes/Object/Object.ts b/src/shapes/Object/Object.ts
index 21373d9e04c..19b15fc0691 100644
--- a/src/shapes/Object/Object.ts
+++ b/src/shapes/Object/Object.ts
@@ -3,8 +3,8 @@ import { config } from '../../config';
 import { ALIASING_LIMIT, iMatrix, VERSION } from '../../constants';
 import { ObjectEvents } from '../../EventTypeDefs';
 import { AnimatableObject } from './AnimatableObject';
-import { Point } from '../../point.class';
-import { Shadow } from '../../shadow.class';
+import { Point } from '../../Point';
+import { Shadow } from '../../Shadow';
 import type {
   TClassProperties,
   TDegree,
@@ -26,18 +26,18 @@ import {
 } from '../../util/misc/objectTransforms';
 import { pick } from '../../util/misc/pick';
 import { toFixed } from '../../util/misc/toFixed';
-import type { Group } from '../group.class';
-import { StaticCanvas } from '../../canvas/static_canvas.class';
+import type { Group } from '../Group';
+import { StaticCanvas } from '../../canvas/StaticCanvas';
 import { isFiller, isSerializableFiller, isTextObject } from '../../util/types';
-import { Image } from '../image.class';
+import { Image } from '../Image';
 import {
   cacheProperties,
   fabricObjectDefaultValues,
   stateProperties,
 } from './defaultValues';
-import type { Gradient } from '../../gradient/gradient.class';
-import type { Pattern } from '../../pattern.class';
-import type { Canvas } from '../../canvas/canvas_events';
+import type { Gradient } from '../../gradient/Gradient';
+import type { Pattern } from '../../Pattern';
+import type { Canvas } from '../../canvas/Canvas';
 import { removeTransformMatrixForSvgParsing } from '../../util/transform_matrix_removal';
 
 export type TCachedFabricObject = FabricObject &
diff --git a/src/shapes/Object/ObjectGeometry.ts b/src/shapes/Object/ObjectGeometry.ts
index 1d8fadd1a02..c7e0304be2d 100644
--- a/src/shapes/Object/ObjectGeometry.ts
+++ b/src/shapes/Object/ObjectGeometry.ts
@@ -7,8 +7,8 @@ import type {
   TOriginY,
 } from '../../typedefs';
 import { iMatrix } from '../../constants';
-import { Intersection } from '../../intersection.class';
-import { Point } from '../../point.class';
+import { Intersection } from '../../Intersection';
+import { Point } from '../../Point';
 import { makeBoundingBoxFromPoints } from '../../util/misc/boundingBoxFromPoints';
 import { cos } from '../../util/misc/cos';
 import {
@@ -21,8 +21,8 @@ import {
 } from '../../util/misc/matrix';
 import { degreesToRadians } from '../../util/misc/radiansDegreesConversion';
 import { sin } from '../../util/misc/sin';
-import type { Canvas } from '../../canvas/canvas_events';
-import type { StaticCanvas } from '../../canvas/static_canvas.class';
+import type { Canvas } from '../../canvas/Canvas';
+import type { StaticCanvas } from '../../canvas/StaticCanvas';
 import { ObjectOrigin } from './ObjectOrigin';
 import { ObjectEvents } from '../../EventTypeDefs';
 
diff --git a/src/shapes/Object/ObjectOrigin.ts b/src/shapes/Object/ObjectOrigin.ts
index 70c7453e8ac..a17084e1a95 100644
--- a/src/shapes/Object/ObjectOrigin.ts
+++ b/src/shapes/Object/ObjectOrigin.ts
@@ -1,5 +1,5 @@
-import { Point } from '../../point.class';
-import type { Group } from '../group.class';
+import { Point } from '../../Point';
+import type { Group } from '../Group';
 import { TDegree, TOriginX, TOriginY } from '../../typedefs';
 import { transformPoint } from '../../util/misc/matrix';
 import { sizeAfterTransform } from '../../util/misc/objectTransforms';
diff --git a/src/shapes/Object/StackedObject.ts b/src/shapes/Object/StackedObject.ts
index 5c1728b6b72..3167b0aec52 100644
--- a/src/shapes/Object/StackedObject.ts
+++ b/src/shapes/Object/StackedObject.ts
@@ -1,7 +1,7 @@
 import { ObjectEvents } from '../../EventTypeDefs';
-import type { Group } from '../group.class';
-import type { Canvas } from '../../canvas/canvas_events';
-import { StaticCanvas } from '../../canvas/static_canvas.class';
+import type { Group } from '../Group';
+import type { Canvas } from '../../canvas/Canvas';
+import { StaticCanvas } from '../../canvas/StaticCanvas';
 import { ObjectGeometry } from './ObjectGeometry';
 
 type TAncestor = StackedObject | Canvas | StaticCanvas;
diff --git a/src/shapes/path.class.ts b/src/shapes/Path.ts
similarity index 99%
rename from src/shapes/path.class.ts
rename to src/shapes/Path.ts
index 7832834b464..ea1d9809064 100644
--- a/src/shapes/path.class.ts
+++ b/src/shapes/Path.ts
@@ -2,7 +2,7 @@
 import { config } from '../config';
 import { SHARED_ATTRIBUTES } from '../parser/attributes';
 import { parseAttributes } from '../parser/parseAttributes';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import { PathData, TClassProperties } from '../typedefs';
 import { makeBoundingBoxFromPoints } from '../util/misc/boundingBoxFromPoints';
 import { toFixed } from '../util/misc/toFixed';
diff --git a/src/shapes/polygon.class.ts b/src/shapes/Polygon.ts
similarity index 86%
rename from src/shapes/polygon.class.ts
rename to src/shapes/Polygon.ts
index fac6f1d1057..09750b97aca 100644
--- a/src/shapes/polygon.class.ts
+++ b/src/shapes/Polygon.ts
@@ -1,6 +1,6 @@
 import { TClassProperties } from '../typedefs';
 import { classRegistry } from '../util/class_registry';
-import { Polyline, polylineDefaultValues } from './polyline.class';
+import { Polyline, polylineDefaultValues } from './Polyline';
 
 export class Polygon extends Polyline {
   protected isOpen() {
diff --git a/src/shapes/polyline.class.ts b/src/shapes/Polyline.ts
similarity index 99%
rename from src/shapes/polyline.class.ts
rename to src/shapes/Polyline.ts
index 941dde47719..16d036f3ad3 100644
--- a/src/shapes/polyline.class.ts
+++ b/src/shapes/Polyline.ts
@@ -2,7 +2,7 @@ import { config } from '../config';
 import { SHARED_ATTRIBUTES } from '../parser/attributes';
 import { parseAttributes } from '../parser/parseAttributes';
 import { parsePointsAttribute } from '../parser/parsePointsAttribute';
-import { IPoint, Point } from '../point.class';
+import { IPoint, Point } from '../Point';
 import { TClassProperties } from '../typedefs';
 import { classRegistry } from '../util/class_registry';
 import { makeBoundingBoxFromPoints } from '../util/misc/boundingBoxFromPoints';
diff --git a/src/shapes/rect.class.ts b/src/shapes/Rect.ts
similarity index 100%
rename from src/shapes/rect.class.ts
rename to src/shapes/Rect.ts
diff --git a/src/shapes/Text/Text.ts b/src/shapes/Text/Text.ts
index 31f91f840d1..f2b65b08652 100644
--- a/src/shapes/Text/Text.ts
+++ b/src/shapes/Text/Text.ts
@@ -5,7 +5,7 @@ import { ObjectEvents } from '../../EventTypeDefs';
 import { TextStyle, TextStyleDeclaration, StyledText } from './StyledText';
 import { SHARED_ATTRIBUTES } from '../../parser/attributes';
 import { parseAttributes } from '../../parser/parseAttributes';
-import type { Point } from '../../point.class';
+import type { Point } from '../../Point';
 import type {
   TCacheCanvasDimensions,
   TClassProperties,
@@ -21,7 +21,7 @@ import {
 } from '../../util/misc/textStyles';
 import { getPathSegmentsInfo, getPointOnPath } from '../../util/path';
 import { cacheProperties } from '../Object/FabricObject';
-import { Path } from '../path.class';
+import { Path } from '../Path';
 import { TextSVGExportMixin } from './TextSVGExportMixin';
 import { applyMixins } from '../../util/applyMixins';
 
diff --git a/src/shapes/textbox.class.ts b/src/shapes/Textbox.ts
similarity index 100%
rename from src/shapes/textbox.class.ts
rename to src/shapes/Textbox.ts
diff --git a/src/shapes/triangle.class.ts b/src/shapes/Triangle.ts
similarity index 100%
rename from src/shapes/triangle.class.ts
rename to src/shapes/Triangle.ts
diff --git a/src/typedefs.ts b/src/typedefs.ts
index cfd68621e8c..c59f48fd119 100644
--- a/src/typedefs.ts
+++ b/src/typedefs.ts
@@ -1,8 +1,8 @@
 // https://www.typescriptlang.org/docs/handbook/utility-types.html
 import { BaseFabricObject } from './EventTypeDefs';
-import type { Gradient } from './gradient/gradient.class';
-import type { Pattern } from './pattern.class';
-import type { Point } from './point.class';
+import type { Gradient } from './gradient/Gradient';
+import type { Pattern } from './Pattern';
+import type { Point } from './Point';
 import type { FabricObject } from './shapes/Object/FabricObject';
 
 interface NominalTag<T> {
diff --git a/src/util/animation/AnimationRegistry.ts b/src/util/animation/AnimationRegistry.ts
index 30df8833c23..1ec3b89d0f4 100644
--- a/src/util/animation/AnimationRegistry.ts
+++ b/src/util/animation/AnimationRegistry.ts
@@ -1,4 +1,4 @@
-import type { Canvas } from '../../canvas/canvas_events';
+import type { Canvas } from '../../canvas/Canvas';
 import type { FabricObject } from '../../shapes/Object/FabricObject';
 import type { AnimationBase } from './AnimationBase';
 
diff --git a/src/util/animation/ColorAnimation.ts b/src/util/animation/ColorAnimation.ts
index 2b7f3c0a0e7..3cc5adfdf7c 100644
--- a/src/util/animation/ColorAnimation.ts
+++ b/src/util/animation/ColorAnimation.ts
@@ -1,5 +1,5 @@
-import { Color } from '../../color/color.class';
-import { TRGBAColorSource } from '../../color/color.class';
+import { Color } from '../../color/Color';
+import { TRGBAColorSource } from '../../color/Color';
 import { halfPI } from '../../constants';
 import { capValue } from '../misc/capValue';
 import { AnimationBase } from './AnimationBase';
diff --git a/src/util/animation/animate.ts b/src/util/animation/animate.ts
index eb552826b2e..ae4ecafc3e4 100644
--- a/src/util/animation/animate.ts
+++ b/src/util/animation/animate.ts
@@ -6,7 +6,7 @@ import {
   ArrayAnimationOptions,
   ColorAnimationOptions,
 } from './types';
-import { TColorArg } from '../../color/color.class';
+import { TColorArg } from '../../color/Color';
 
 export type TAnimation<T extends number | number[] | TColorArg> =
   T extends TColorArg
diff --git a/src/util/animation/types.ts b/src/util/animation/types.ts
index 0d4cec868db..f78ac768421 100644
--- a/src/util/animation/types.ts
+++ b/src/util/animation/types.ts
@@ -1,4 +1,4 @@
-import { TColorArg } from '../../color/color.class';
+import { TColorArg } from '../../color/Color';
 
 export type AnimationState = 'pending' | 'running' | 'completed' | 'aborted';
 
diff --git a/src/util/dom_event.ts b/src/util/dom_event.ts
index fad12ed230b..9fe53c481a4 100644
--- a/src/util/dom_event.ts
+++ b/src/util/dom_event.ts
@@ -1,5 +1,5 @@
 //@ts-nocheck
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import { getScrollLeftTop } from './dom_misc';
 
 const touchEvents = ['touchstart', 'touchmove', 'touchend'];
diff --git a/src/util/misc/boundingBoxFromPoints.ts b/src/util/misc/boundingBoxFromPoints.ts
index c58cec5c1b7..fc41e00e502 100644
--- a/src/util/misc/boundingBoxFromPoints.ts
+++ b/src/util/misc/boundingBoxFromPoints.ts
@@ -1,4 +1,4 @@
-import { IPoint, Point } from '../../point.class';
+import { IPoint, Point } from '../../Point';
 import { TBBox } from '../../typedefs';
 
 /**
diff --git a/src/util/misc/groupSVGElements.ts b/src/util/misc/groupSVGElements.ts
index 354ba3af555..4db737fe317 100644
--- a/src/util/misc/groupSVGElements.ts
+++ b/src/util/misc/groupSVGElements.ts
@@ -1,5 +1,5 @@
 import type { FabricObject } from '../../shapes/Object/FabricObject';
-import { Group } from '../../shapes/group.class';
+import { Group } from '../../shapes/Group';
 
 /**
  * Groups SVG elements (usually those retrieved from SVG document)
diff --git a/src/util/misc/matrix.ts b/src/util/misc/matrix.ts
index 0699352603e..3d0e91a7178 100644
--- a/src/util/misc/matrix.ts
+++ b/src/util/misc/matrix.ts
@@ -1,5 +1,5 @@
 import { iMatrix } from '../../constants';
-import { IPoint, Point } from '../../point.class';
+import { IPoint, Point } from '../../Point';
 import { TDegree, TMat2D } from '../../typedefs';
 import { cos } from './cos';
 import { degreesToRadians, radiansToDegrees } from './radiansDegreesConversion';
diff --git a/src/util/misc/mergeClipPaths.ts b/src/util/misc/mergeClipPaths.ts
index da4e6b9609d..aeca53ce250 100644
--- a/src/util/misc/mergeClipPaths.ts
+++ b/src/util/misc/mergeClipPaths.ts
@@ -1,6 +1,6 @@
 import type { FabricObject } from '../../shapes/Object/FabricObject';
 import { sendObjectToPlane } from './planeChange';
-import { Group } from '../../shapes/group.class';
+import { Group } from '../../shapes/Group';
 /**
  * Merges 2 clip paths into one visually equal clip path
  *
diff --git a/src/util/misc/objectEnlive.ts b/src/util/misc/objectEnlive.ts
index adea6a9d9d9..874664e387d 100644
--- a/src/util/misc/objectEnlive.ts
+++ b/src/util/misc/objectEnlive.ts
@@ -1,6 +1,6 @@
 import { noop } from '../../constants';
-import type { Gradient } from '../../gradient/gradient.class';
-import type { Pattern } from '../../pattern.class';
+import type { Gradient } from '../../gradient/Gradient';
+import type { Pattern } from '../../Pattern';
 import type { FabricObject } from '../../shapes/Object/FabricObject';
 import type { TCrossOrigin, TFiller } from '../../typedefs';
 import { createImage } from './dom';
diff --git a/src/util/misc/objectTransforms.ts b/src/util/misc/objectTransforms.ts
index b42fef49f08..ea7ed95de2d 100644
--- a/src/util/misc/objectTransforms.ts
+++ b/src/util/misc/objectTransforms.ts
@@ -1,4 +1,4 @@
-import { Point } from '../../point.class';
+import { Point } from '../../Point';
 import type { FabricObject } from '../../shapes/Object/Object';
 import { TMat2D } from '../../typedefs';
 import { makeBoundingBoxFromPoints } from './boundingBoxFromPoints';
diff --git a/src/util/misc/planeChange.ts b/src/util/misc/planeChange.ts
index 8a486d5b12f..a6e07cdac6d 100644
--- a/src/util/misc/planeChange.ts
+++ b/src/util/misc/planeChange.ts
@@ -1,8 +1,8 @@
 import { iMatrix } from '../../constants';
-import type { Point } from '../../point.class';
+import type { Point } from '../../Point';
 import type { FabricObject } from '../../shapes/Object/FabricObject';
 import type { TMat2D } from '../../typedefs';
-import type { StaticCanvas } from '../../canvas/static_canvas.class';
+import type { StaticCanvas } from '../../canvas/StaticCanvas';
 import { invertTransform, multiplyTransformMatrices } from './matrix';
 import { applyTransformToObject } from './objectTransforms';
 
diff --git a/src/util/misc/projectStroke/StrokeLineCapProjections.ts b/src/util/misc/projectStroke/StrokeLineCapProjections.ts
index 4ddeb1609c3..9bf66d738bc 100644
--- a/src/util/misc/projectStroke/StrokeLineCapProjections.ts
+++ b/src/util/misc/projectStroke/StrokeLineCapProjections.ts
@@ -1,4 +1,4 @@
-import { IPoint, Point } from '../../../point.class';
+import { IPoint, Point } from '../../../Point';
 import { createVector, getOrthonormalVector, getUnitVector } from '../vectors';
 import { StrokeLineJoinProjections } from './StrokeLineJoinProjections';
 import { StrokeProjectionsBase } from './StrokeProjectionsBase';
diff --git a/src/util/misc/projectStroke/StrokeLineJoinProjections.ts b/src/util/misc/projectStroke/StrokeLineJoinProjections.ts
index 6d05cc5f73b..1d927c4ecfe 100644
--- a/src/util/misc/projectStroke/StrokeLineJoinProjections.ts
+++ b/src/util/misc/projectStroke/StrokeLineJoinProjections.ts
@@ -1,4 +1,4 @@
-import { IPoint, Point } from '../../../point.class';
+import { IPoint, Point } from '../../../Point';
 import { degreesToRadians } from '../radiansDegreesConversion';
 import { getBisector, getOrthonormalVector, magnitude } from '../vectors';
 import { StrokeProjectionsBase } from './StrokeProjectionsBase';
diff --git a/src/util/misc/projectStroke/StrokeProjectionsBase.ts b/src/util/misc/projectStroke/StrokeProjectionsBase.ts
index ead44597927..fdb8aa929ca 100644
--- a/src/util/misc/projectStroke/StrokeProjectionsBase.ts
+++ b/src/util/misc/projectStroke/StrokeProjectionsBase.ts
@@ -1,5 +1,5 @@
 import { halfPI } from '../../../constants';
-import { IPoint, Point } from '../../../point.class';
+import { IPoint, Point } from '../../../Point';
 import { degreesToRadians } from '../radiansDegreesConversion';
 import {
   calcAngleBetweenVectors,
diff --git a/src/util/misc/projectStroke/index.ts b/src/util/misc/projectStroke/index.ts
index 97ec674793d..7722dbdc917 100644
--- a/src/util/misc/projectStroke/index.ts
+++ b/src/util/misc/projectStroke/index.ts
@@ -1,4 +1,4 @@
-import { IPoint } from '../../../point.class';
+import { IPoint } from '../../../Point';
 import { StrokeLineCapProjections } from './StrokeLineCapProjections';
 import { StrokeLineJoinProjections } from './StrokeLineJoinProjections';
 import { TProjection, TProjectStrokeOnPointsOptions } from './types';
diff --git a/src/util/misc/projectStroke/types.ts b/src/util/misc/projectStroke/types.ts
index fa91a0fefb2..0873e64ca7c 100644
--- a/src/util/misc/projectStroke/types.ts
+++ b/src/util/misc/projectStroke/types.ts
@@ -1,4 +1,4 @@
-import { Point } from '../../../point.class';
+import { Point } from '../../../Point';
 import { TDegree } from '../../../typedefs';
 import { getBisector } from '../vectors';
 
diff --git a/src/util/misc/rotatePoint.ts b/src/util/misc/rotatePoint.ts
index fd0bf376313..9ca135b4e20 100644
--- a/src/util/misc/rotatePoint.ts
+++ b/src/util/misc/rotatePoint.ts
@@ -1,4 +1,4 @@
-import type { Point } from '../../point.class';
+import type { Point } from '../../Point';
 import type { TRadian } from '../../typedefs';
 /**
  * Rotates `point` around `origin` with `radians`
diff --git a/src/util/misc/svgParsing.ts b/src/util/misc/svgParsing.ts
index 2b8cef36724..944c8a06a2f 100644
--- a/src/util/misc/svgParsing.ts
+++ b/src/util/misc/svgParsing.ts
@@ -1,4 +1,4 @@
-import { Color } from '../../color/color.class';
+import { Color } from '../../color/Color';
 import { config } from '../../config';
 import { DEFAULT_SVG_FONT_SIZE } from '../../constants';
 import {
diff --git a/src/util/misc/vectors.ts b/src/util/misc/vectors.ts
index 73c223fd4cf..1f9da0dcf52 100644
--- a/src/util/misc/vectors.ts
+++ b/src/util/misc/vectors.ts
@@ -1,4 +1,4 @@
-import { IPoint, Point } from '../../point.class';
+import { IPoint, Point } from '../../Point';
 import { TRadian } from '../../typedefs';
 
 const unitVectorX = new Point(1, 0);
diff --git a/src/util/path.ts b/src/util/path.ts
index adc389930a5..27976c901f5 100644
--- a/src/util/path.ts
+++ b/src/util/path.ts
@@ -4,7 +4,7 @@ import { cache } from '../cache';
 import { config } from '../config';
 import { halfPI, PiBy180 } from '../constants';
 import { commaWsp, rePathCommand } from '../parser/constants';
-import { Point } from '../point.class';
+import { Point } from '../Point';
 import type { PathData, TMat2D } from '../typedefs';
 import { cos } from './misc/cos';
 import { multiplyTransformMatrices, transformPoint } from './misc/matrix';
diff --git a/src/util/transform_matrix_removal.ts b/src/util/transform_matrix_removal.ts
index a560726788b..c019a78b557 100644
--- a/src/util/transform_matrix_removal.ts
+++ b/src/util/transform_matrix_removal.ts
@@ -1,4 +1,4 @@
-import { Image } from '../shapes/image.class';
+import { Image } from '../shapes/Image';
 import type { FabricObject } from '../shapes/Object/FabricObject';
 import { TMat2D } from '../typedefs';
 import { qrDecompose } from './misc/matrix';
diff --git a/src/util/types.ts b/src/util/types.ts
index b8d9e4ac873..a6f901a73f6 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -1,5 +1,5 @@
-import type { ActiveSelection } from '../shapes/active_selection.class';
-import type { Group } from '../shapes/group.class';
+import type { ActiveSelection } from '../shapes/ActiveSelection';
+import type { Group } from '../shapes/Group';
 import type {
   FabricObject,
   TCachedFabricObject,
@@ -7,9 +7,9 @@ import type {
 import type { FabricObjectWithDragSupport } from '../shapes/Object/InteractiveObject';
 import type { TFiller } from '../typedefs';
 import type { Text } from '../shapes/Text/Text';
-import type { Pattern } from '../pattern.class';
+import type { Pattern } from '../Pattern';
 import type { IText } from '../shapes/IText/IText';
-import type { Textbox } from '../shapes/textbox.class';
+import type { Textbox } from '../shapes/Textbox';
 
 export const isFiller = (
   filler: TFiller | string | null