diff --git a/web/app/brep/brep-primitives.js b/web/app/brep/brep-primitives.js
index b25f379e..a00c7163 100644
--- a/web/app/brep/brep-primitives.js
+++ b/web/app/brep/brep-primitives.js
@@ -2,7 +2,7 @@ import {Point} from './geom/point'
 import {Plane} from './geom/impl/plane'
 import {createPrism, enclose} from './brep-enclose'
 import {AXIS, Matrix3} from '../math/l3space'
-import {Circle} from '../cad/craft/sketch/sketch-model'
+import {Circle} from '../cad/sketch/sketchModel'
 
 export function box(w, h, d, tr) {
   const wh = w * 0.5;
diff --git a/web/app/cad/craft/brep/cut-extrude.js b/web/app/cad/craft/brep/cut-extrude.js
index 7a75cd55..e371eafa 100644
--- a/web/app/cad/craft/brep/cut-extrude.js
+++ b/web/app/cad/craft/brep/cut-extrude.js
@@ -6,8 +6,8 @@ import * as stitching from '../../../brep/stitching'
 import {Loop} from '../../../brep/topo/loop'
 import {incRefCounter} from '../../../brep/topo/topo-object'
 import {Line} from '../../../brep/geom/impl/line'
-import {ReadSketchFromFace} from '../sketch/sketch-reader'
-import {Segment} from '../sketch/sketch-model'
+import {ReadSketchFromFace} from '../../sketch/sketchReader'
+import {Segment} from '../../sketch/sketchModel'
 import {isCurveClass} from '../../cad-utils'
 import {BooleanOperation, combineShells} from './boolean-operation'
 
diff --git a/web/app/cad/craft/brep/revolve.js b/web/app/cad/craft/brep/revolve.js
index ab47f1ad..4a458759 100644
--- a/web/app/cad/craft/brep/revolve.js
+++ b/web/app/cad/craft/brep/revolve.js
@@ -1,5 +1,5 @@
 import {BooleanOperation, combineShells} from './boolean-operation'
-import {ReadSketchFromFace} from '../sketch/sketch-reader'
+import {ReadSketchFromFace} from '../../sketch/sketchReader'
 import {revolve} from '../../../brep/brep-builder'
 
 export function Revolve(app, params) {
diff --git a/web/app/cad/modeler-app.js b/web/app/cad/modeler-app.js
index 9e2d3f39..002c46b8 100644
--- a/web/app/cad/modeler-app.js
+++ b/web/app/cad/modeler-app.js
@@ -9,7 +9,7 @@ import * as AllActions from './actions/allActions'
 import Vector from 'math/vector';
 import {Matrix3, AXIS, ORIGIN, IDENTITY_BASIS} from '../math/l3space'
 import {Craft} from './craft/craft'
-import {ReadSketch}  from './craft/sketch/sketch-reader'
+import {ReadSketch}  from './sketch/sketchReader'
 import * as workbench  from './craft/mesh/workbench'
 import * as cad_utils from './cad-utils'
 import * as math from '../math/math'
@@ -24,7 +24,7 @@ import {BREPValidator} from '../brep/brep-validator'
 import {BREPSceneSolid} from './scene/wrappers/brepSceneObject'
 import TPI from './tpi'
 import {NurbsCurve, NurbsCurveImpl, NurbsSurface} from "../brep/geom/impl/nurbs";
-import {Circle} from "./craft/sketch/sketch-model";
+import {Circle} from "./sketch/sketchModel";
 import {Plane} from "../brep/geom/impl/plane";
 import {enclose} from "../brep/brep-enclose";
 // import {createSphere, rayMarchOntoCanvas, sdfIntersection, sdfSolid, sdfSubtract, sdfTransform, sdfUnion} from "../hds/sdf";
diff --git a/web/app/cad/scene/wrappers/sceneObject.js b/web/app/cad/scene/wrappers/sceneObject.js
index 4e9e2755..53e272f2 100644
--- a/web/app/cad/scene/wrappers/sceneObject.js
+++ b/web/app/cad/scene/wrappers/sceneObject.js
@@ -4,7 +4,7 @@ import Counters from '../../counters'
 import {Matrix3, BasisForPlane} from '../../../math/l3space'
 import {isCurveClass} from '../../cad-utils'
 import DPR from 'dpr'
-import {ReadSketch, ReadSketchFromFace} from "../../craft/sketch/sketch-reader";
+import {ReadSketch, ReadSketchFromFace} from "../../sketch/sketchReader";
 import {setAttribute} from "../../../../../modules/scene/objectData";
 import {genSolidId} from "../../craft/cadRegistryPlugin";
 
diff --git a/web/app/cad/craft/sketch/sketch-model.js b/web/app/cad/sketch/sketchModel.js
similarity index 100%
rename from web/app/cad/craft/sketch/sketch-model.js
rename to web/app/cad/sketch/sketchModel.js
diff --git a/web/app/cad/craft/sketch/sketch-reader.js b/web/app/cad/sketch/sketchReader.js
similarity index 96%
rename from web/app/cad/craft/sketch/sketch-reader.js
rename to web/app/cad/sketch/sketchReader.js
index 35851fef..596de99a 100644
--- a/web/app/cad/craft/sketch/sketch-reader.js
+++ b/web/app/cad/sketch/sketchReader.js
@@ -1,9 +1,9 @@
-import * as sm from './sketch-model'
-import {Matrix3, AXIS, ORIGIN} from '../../../math/l3space'
+import * as sm from './sketchModel'
+import {Matrix3, AXIS, ORIGIN} from '../../math/l3space'
 import Vector from 'math/vector';
-import {Graph} from '../../../math/graph'
-import * as math from '../../../math/math'
-import {HashTable} from '../../../utils/hashmap'
+import {Graph} from '../../math/graph'
+import * as math from '../../math/math'
+import {HashTable} from '../../utils/hashmap'
 
 class SketchGeom {