diff --git a/web/app/brep/brep-builder.js b/modules/brep/brep-builder.js
similarity index 91%
rename from web/app/brep/brep-builder.js
rename to modules/brep/brep-builder.js
index f9876715..af81a8d7 100644
--- a/web/app/brep/brep-builder.js
+++ b/modules/brep/brep-builder.js
@@ -1,13 +1,13 @@
-import {Plane} from '../../../modules/geom/impl/plane';
-import {Point} from '../../../modules/geom/point';
+import {Plane} from '../geom/impl/plane';
+import {Point} from '../geom/point';
 import {Shell} from './topo/shell';
 import {Face} from './topo/face';
 import {Loop} from './topo/loop';
 import {Vertex} from './topo/vertex';
-import {normalOfCCWSeq} from '../cad/cad-utils';
-import BBox from '../../../modules/math/bbox';
-import NurbsSurface from '../../../modules/geom/surfaces/nurbsSurface';
-import {BrepSurface} from '../../../modules/geom/surfaces/brepSurface';
+import {normalOfCCWSeq} from '../../web/app/cad/cad-utils';
+import BBox from '../math/bbox';
+import NurbsSurface from '../geom/surfaces/nurbsSurface';
+import {BrepSurface} from '../geom/surfaces/brepSurface';
 import EdgeIndex from './edgeIndex';
 
 export default class BrepBuilder {
diff --git a/web/app/brep/brep-enclose.js b/modules/brep/brep-enclose.js
similarity index 91%
rename from web/app/brep/brep-enclose.js
rename to modules/brep/brep-enclose.js
index 5202abdd..937c3951 100644
--- a/web/app/brep/brep-enclose.js
+++ b/modules/brep/brep-enclose.js
@@ -1,12 +1,12 @@
 import {Shell} from './topo/shell';
 import {Face} from './topo/face';
 import {Edge} from './topo/edge';
-import BrepCurve from '../../../modules/geom/curves/brepCurve';
-import {Plane} from '../../../modules/geom/impl/plane';
-import * as cad_utils from '../cad/cad-utils';
+import BrepCurve from '../geom/curves/brepCurve';
+import {Plane} from '../geom/impl/plane';
+import * as cad_utils from '../../web/app/cad/cad-utils';
 import {createBoundingSurface} from './brep-builder';
-import NurbsSurface from '../../../modules/geom/surfaces/nurbsSurface';
-import {BrepSurface} from '../../../modules/geom/surfaces/brepSurface';
+import NurbsSurface from '../geom/surfaces/nurbsSurface';
+import {BrepSurface} from '../geom/surfaces/brepSurface';
 import {Matrix3x4} from 'math/matrix';
 import {BasisForPlane} from "math/basis";
 import {isCCW as isCCWtest} from "geom/euclidean";
diff --git a/web/app/brep/brep-primitives.js b/modules/brep/brep-primitives.js
similarity index 81%
rename from web/app/brep/brep-primitives.js
rename to modules/brep/brep-primitives.js
index fe46a907..c366ef2b 100644
--- a/web/app/brep/brep-primitives.js
+++ b/modules/brep/brep-primitives.js
@@ -1,10 +1,10 @@
-import {Point} from '../../../modules/geom/point'
-import {Plane} from '../../../modules/geom/impl/plane'
+import {Point} from '../geom/point'
+import {Plane} from '../geom/impl/plane'
 import {createPrism, enclose} from './brep-enclose'
-import {Circle} from '../cad/sketch/sketchModel'
+import {Circle} from '../../web/app/cad/sketch/sketchModel'
 import CSys from 'math/csys';
 import {Matrix3x4} from 'math/matrix';
-import {AXIS} from "../../../modules/math/vector";
+import {AXIS} from "../math/vector";
 
 export function box(w, h, d, tr) {
   const wh = w * 0.5;
diff --git a/web/app/brep/brep-validator.js b/modules/brep/brep-validator.js
similarity index 100%
rename from web/app/brep/brep-validator.js
rename to modules/brep/brep-validator.js
diff --git a/web/app/brep/debug/brep-debug.js b/modules/brep/debug/brep-debug.js
similarity index 100%
rename from web/app/brep/debug/brep-debug.js
rename to modules/brep/debug/brep-debug.js
diff --git a/web/app/brep/debug/debugger/BrepDebuggerWindow.jsx b/modules/brep/debug/debugger/BrepDebuggerWindow.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/BrepDebuggerWindow.jsx
rename to modules/brep/debug/debugger/BrepDebuggerWindow.jsx
diff --git a/web/app/brep/debug/debugger/BrepDebuggerWindow.less b/modules/brep/debug/debugger/BrepDebuggerWindow.less
similarity index 100%
rename from web/app/brep/debug/debugger/BrepDebuggerWindow.less
rename to modules/brep/debug/debugger/BrepDebuggerWindow.less
diff --git a/web/app/brep/debug/debugger/brepDebugger.jsx b/modules/brep/debug/debugger/brepDebugger.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/brepDebugger.jsx
rename to modules/brep/debug/debugger/brepDebugger.jsx
diff --git a/web/app/brep/debug/debugger/brepDebugger.less b/modules/brep/debug/debugger/brepDebugger.less
similarity index 100%
rename from web/app/brep/debug/debugger/brepDebugger.less
rename to modules/brep/debug/debugger/brepDebugger.less
diff --git a/web/app/brep/debug/debugger/colors.js b/modules/brep/debug/debugger/colors.js
similarity index 100%
rename from web/app/brep/debug/debugger/colors.js
rename to modules/brep/debug/debugger/colors.js
diff --git a/web/app/brep/debug/debugger/edgeIntersectionsExplorer.jsx b/modules/brep/debug/debugger/edgeIntersectionsExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/edgeIntersectionsExplorer.jsx
rename to modules/brep/debug/debugger/edgeIntersectionsExplorer.jsx
diff --git a/web/app/brep/debug/debugger/edgeTransferExplorer.jsx b/modules/brep/debug/debugger/edgeTransferExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/edgeTransferExplorer.jsx
rename to modules/brep/debug/debugger/edgeTransferExplorer.jsx
diff --git a/web/app/brep/debug/debugger/faceFilterExplorer.jsx b/modules/brep/debug/debugger/faceFilterExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/faceFilterExplorer.jsx
rename to modules/brep/debug/debugger/faceFilterExplorer.jsx
diff --git a/web/app/brep/debug/debugger/faceIntersectionsExplorer.jsx b/modules/brep/debug/debugger/faceIntersectionsExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/faceIntersectionsExplorer.jsx
rename to modules/brep/debug/debugger/faceIntersectionsExplorer.jsx
diff --git a/web/app/brep/debug/debugger/faceMergeExplorer.jsx b/modules/brep/debug/debugger/faceMergeExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/faceMergeExplorer.jsx
rename to modules/brep/debug/debugger/faceMergeExplorer.jsx
diff --git a/web/app/brep/debug/debugger/loopDetectionExplorer.jsx b/modules/brep/debug/debugger/loopDetectionExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/loopDetectionExplorer.jsx
rename to modules/brep/debug/debugger/loopDetectionExplorer.jsx
diff --git a/web/app/brep/debug/debugger/markedEdgesExplorer.jsx b/modules/brep/debug/debugger/markedEdgesExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/markedEdgesExplorer.jsx
rename to modules/brep/debug/debugger/markedEdgesExplorer.jsx
diff --git a/web/app/brep/debug/debugger/section.jsx b/modules/brep/debug/debugger/section.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/section.jsx
rename to modules/brep/debug/debugger/section.jsx
diff --git a/web/app/brep/debug/debugger/shellExplorer.jsx b/modules/brep/debug/debugger/shellExplorer.jsx
similarity index 100%
rename from web/app/brep/debug/debugger/shellExplorer.jsx
rename to modules/brep/debug/debugger/shellExplorer.jsx
diff --git a/web/app/brep/debug/debugger/utils.jsx b/modules/brep/debug/debugger/utils.jsx
similarity index 99%
rename from web/app/brep/debug/debugger/utils.jsx
rename to modules/brep/debug/debugger/utils.jsx
index 498504dc..2df9f002 100644
--- a/web/app/brep/debug/debugger/utils.jsx
+++ b/modules/brep/debug/debugger/utils.jsx
@@ -4,7 +4,7 @@ import {
   YELLOW
 } from "./colors";
 import Section from "./section";
-import {distanceAB3} from "../../../../../modules/math/distance";
+import {distanceAB3} from "../../../math/distance";
 
 export function getFacesViewObjects(group3d, category, context, out, faces) {
   forEach(faces, getFaceViewObjects.bind(null, group3d, category, context, out));
diff --git a/web/app/brep/edgeIndex.js b/modules/brep/edgeIndex.js
similarity index 95%
rename from web/app/brep/edgeIndex.js
rename to modules/brep/edgeIndex.js
index d7aa7ef0..335a3987 100644
--- a/web/app/brep/edgeIndex.js
+++ b/modules/brep/edgeIndex.js
@@ -1,5 +1,5 @@
 import {Edge} from './topo/edge';
-import BrepCurve from '../../../modules/geom/curves/brepCurve';
+import BrepCurve from '../geom/curves/brepCurve';
 
 export default class EdgeIndex {
   
diff --git a/web/app/brep/io/brepIO.ts b/modules/brep/io/brepIO.ts
similarity index 88%
rename from web/app/brep/io/brepIO.ts
rename to modules/brep/io/brepIO.ts
index 4c3f0197..44016f9e 100644
--- a/web/app/brep/io/brepIO.ts
+++ b/modules/brep/io/brepIO.ts
@@ -1,15 +1,15 @@
 import BrepBuilder, {createBoundingSurfaceFrom2DPoints, createBoundingSurfaceFromBBox} from '../brep-builder';
 import VertexFactory from '../vertexFactory';
-import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface';
+import NurbsSurface from '../../geom/surfaces/nurbsSurface';
 import * as vec from 'math/vec';
-import {BrepSurface} from '../../../../modules/geom/surfaces/brepSurface';
-import {Plane} from '../../../../modules/geom/impl/plane';
-import Vector from '../../../../modules/math/vector';
-import NullSurface from '../../../../modules/geom/surfaces/nullSurface';
+import {BrepSurface} from '../../geom/surfaces/brepSurface';
+import {Plane} from '../../geom/impl/plane';
+import Vector from '../../math/vector';
+import NullSurface from '../../geom/surfaces/nullSurface';
 import BBox from 'math/bbox';
-import NurbsCurve from '../../../../modules/geom/curves/nurbsCurve';
-import BrepCurve from '../../../../modules/geom/curves/brepCurve';
-import {BREPData} from "../../cad/craft/engine/brepData";
+import NurbsCurve from '../../geom/curves/nurbsCurve';
+import BrepCurve from '../../geom/curves/brepCurve';
+import {BREPData} from "../../../web/app/cad/craft/engine/brepData";
 
 export function readBrep(data: BREPData) {
   
diff --git a/web/app/brep/io/brepLoopsFormat.js b/modules/brep/io/brepLoopsFormat.js
similarity index 100%
rename from web/app/brep/io/brepLoopsFormat.js
rename to modules/brep/io/brepLoopsFormat.js
diff --git a/web/app/brep/null-face-merge.js b/modules/brep/null-face-merge.js
similarity index 100%
rename from web/app/brep/null-face-merge.js
rename to modules/brep/null-face-merge.js
diff --git a/web/app/brep/nurbs-tiling.js b/modules/brep/nurbs-tiling.js
similarity index 100%
rename from web/app/brep/nurbs-tiling.js
rename to modules/brep/nurbs-tiling.js
diff --git a/web/app/brep/operations/boolean-mesh.js b/modules/brep/operations/boolean-mesh.js
similarity index 100%
rename from web/app/brep/operations/boolean-mesh.js
rename to modules/brep/operations/boolean-mesh.js
diff --git a/web/app/brep/operations/boolean.js b/modules/brep/operations/boolean.js
similarity index 99%
rename from web/app/brep/operations/boolean.js
rename to modules/brep/operations/boolean.js
index dfdf59d6..7e16d740 100644
--- a/web/app/brep/operations/boolean.js
+++ b/modules/brep/operations/boolean.js
@@ -4,12 +4,12 @@ import {Loop} from '../topo/loop';
 import {Shell} from '../topo/shell';
 import {Vertex} from '../topo/vertex';
 import {evolveFace} from './evolve-face'
-import {eqTol, TOLERANCE, ueq, veq, veqNeg} from '../../../../modules/geom/tolerance';
-import CadError from "../../utils/errors";
+import {eqTol, TOLERANCE, ueq, veq, veqNeg} from '../../geom/tolerance';
+import CadError from "../../../web/app/utils/errors";
 import {createBoundingSurface} from "../brep-builder";
 import BREP_DEBUG from '../debug/brep-debug';
 import {Face} from "../topo/face";
-import {vectorsEqual} from "../../../../modules/math/equality";
+import {vectorsEqual} from "../../math/equality";
 
 
 const A = 0, B = 1;
diff --git a/web/app/brep/operations/evolve-face.js b/modules/brep/operations/evolve-face.js
similarity index 96%
rename from web/app/brep/operations/evolve-face.js
rename to modules/brep/operations/evolve-face.js
index e35bee4e..8ab113b0 100644
--- a/web/app/brep/operations/evolve-face.js
+++ b/modules/brep/operations/evolve-face.js
@@ -1,8 +1,8 @@
 import {Face} from '../topo/face';
 import {Vertex} from '../topo/vertex';
 import Vector from 'math/vector';
-import PIP from '../../cad/tess/pip';
-import {isCCW} from "../../../../modules/geom/euclidean";
+import PIP from '../../../web/app/cad/tess/pip';
+import {isCCW} from "../../geom/euclidean";
 
 export function evolveFace(originFace, loops) {
   let out = [];
diff --git a/web/app/brep/operations/polyhedronify.js b/modules/brep/operations/polyhedronify.js
similarity index 94%
rename from web/app/brep/operations/polyhedronify.js
rename to modules/brep/operations/polyhedronify.js
index 66a42610..ffdc8787 100644
--- a/web/app/brep/operations/polyhedronify.js
+++ b/modules/brep/operations/polyhedronify.js
@@ -1,11 +1,11 @@
-import {TriangulateFace} from '../../cad/tess/triangulation'
+import {TriangulateFace} from '../../../web/app/cad/tess/triangulation'
 import {Shell} from '../topo/shell'
 import {HalfEdge} from '../topo/edge'
 import {Loop} from '../topo/loop'
 import {Face} from '../topo/face'
 import {BREPValidator} from '../brep-validator';
 import {linkSegments} from '../brep-builder';
-import {Line} from '../../../../modules/geom/impl/line'
+import {Line} from '../../geom/impl/line'
 
 export function polyhedronify(shell) {
   shell.reindexVertices();
diff --git a/web/app/brep/stitching.js b/modules/brep/stitching.js
similarity index 97%
rename from web/app/brep/stitching.js
rename to modules/brep/stitching.js
index 9c8e38aa..52737109 100644
--- a/web/app/brep/stitching.js
+++ b/modules/brep/stitching.js
@@ -1,4 +1,4 @@
-import {DoubleKeyMap} from '../utils/utils'
+import {DoubleKeyMap} from '../../web/app/utils/utils'
 
 export const FACE_CHUNK = 'stitching.face.chunk';
 export const EDGE_CHUNK = 'stitching.edge.chunk';
diff --git a/web/app/brep/topo/edge.ts b/modules/brep/topo/edge.ts
similarity index 94%
rename from web/app/brep/topo/edge.ts
rename to modules/brep/topo/edge.ts
index 5b4b2de7..7a2c05e5 100644
--- a/web/app/brep/topo/edge.ts
+++ b/modules/brep/topo/edge.ts
@@ -1,9 +1,9 @@
 import {TopoObject} from './topo-object'
 import {Vertex} from "./vertex";
-import BrepCurve from "../../../../modules/geom/curves/brepCurve";
+import BrepCurve from "../../geom/curves/brepCurve";
 import {Loop} from "./loop";
 import Vector from "math/vector";
-import {Tessellation1D} from "../../cad/craft/engine/tessellation";
+import {Tessellation1D} from "../../../web/app/cad/craft/engine/tessellation";
 
 export class Edge extends TopoObject {
 
diff --git a/web/app/brep/topo/face.ts b/modules/brep/topo/face.ts
similarity index 95%
rename from web/app/brep/topo/face.ts
rename to modules/brep/topo/face.ts
index cb201611..bc5e7403 100644
--- a/web/app/brep/topo/face.ts
+++ b/modules/brep/topo/face.ts
@@ -1,11 +1,11 @@
 import {TopoObject} from './topo-object'
 import {Loop} from './loop'
-import PIP from '../../cad/tess/pip';
+import PIP from '../../../web/app/cad/tess/pip';
 import {veq} from "geom/tolerance";
 import {isOnPositiveHalfPlaneFromVec} from "../operations/boolean";
-import {BrepSurface} from "../../../../modules/geom/surfaces/brepSurface";
+import {BrepSurface} from "../../geom/surfaces/brepSurface";
 import {Shell} from "./shell";
-import {ProductionInfo} from "../../cad/craft/engine/productionInfo";
+import {ProductionInfo} from "../../../web/app/cad/craft/engine/productionInfo";
 
 declare module './face' {
 
diff --git a/web/app/brep/topo/loop.ts b/modules/brep/topo/loop.ts
similarity index 96%
rename from web/app/brep/topo/loop.ts
rename to modules/brep/topo/loop.ts
index b7ce8673..67ce4ea2 100644
--- a/web/app/brep/topo/loop.ts
+++ b/modules/brep/topo/loop.ts
@@ -1,6 +1,6 @@
 import {TopoObject} from './topo-object'
 import {Face} from "./face";
-import {BrepSurface} from "../../../../modules/geom/surfaces/brepSurface";
+import {BrepSurface} from "../../geom/surfaces/brepSurface";
 import {HalfEdge} from "./edge";
 import {findLowestLeftPoint} from "geom/euclidean";
 
diff --git a/web/app/brep/topo/shell.ts b/modules/brep/topo/shell.ts
similarity index 100%
rename from web/app/brep/topo/shell.ts
rename to modules/brep/topo/shell.ts
diff --git a/web/app/brep/topo/topo-object.ts b/modules/brep/topo/topo-object.ts
similarity index 100%
rename from web/app/brep/topo/topo-object.ts
rename to modules/brep/topo/topo-object.ts
diff --git a/web/app/brep/topo/vertex.ts b/modules/brep/topo/vertex.ts
similarity index 100%
rename from web/app/brep/topo/vertex.ts
rename to modules/brep/topo/vertex.ts
diff --git a/web/app/brep/utils/pickPointInPolygon.js b/modules/brep/utils/pickPointInPolygon.js
similarity index 95%
rename from web/app/brep/utils/pickPointInPolygon.js
rename to modules/brep/utils/pickPointInPolygon.js
index abde8c5d..23c0b75a 100644
--- a/web/app/brep/utils/pickPointInPolygon.js
+++ b/modules/brep/utils/pickPointInPolygon.js
@@ -1,5 +1,5 @@
 import libtess from 'libtess'
-import {area} from "../../../../modules/geom/euclidean";
+import {area} from "../../geom/euclidean";
 
 export default function pickPointInside2dPolygon(polygon) {
   function vertexCallback(data, tr) {
diff --git a/web/app/brep/utils/ray.js b/modules/brep/utils/ray.js
similarity index 87%
rename from web/app/brep/utils/ray.js
rename to modules/brep/utils/ray.js
index 4d2d6388..0183613e 100644
--- a/web/app/brep/utils/ray.js
+++ b/modules/brep/utils/ray.js
@@ -1,5 +1,5 @@
 import pertrub from './vector-petrub';
-import BrepCurve from '../../../../modules/geom/curves/brepCurve';
+import BrepCurve from '../../geom/curves/brepCurve';
 
 
 export class Ray {
diff --git a/web/app/brep/utils/vector-petrub.js b/modules/brep/utils/vector-petrub.js
similarity index 100%
rename from web/app/brep/utils/vector-petrub.js
rename to modules/brep/utils/vector-petrub.js
diff --git a/web/app/brep/vertexFactory.js b/modules/brep/vertexFactory.js
similarity index 82%
rename from web/app/brep/vertexFactory.js
rename to modules/brep/vertexFactory.js
index 0f603434..1a99baaf 100644
--- a/web/app/brep/vertexFactory.js
+++ b/modules/brep/vertexFactory.js
@@ -1,6 +1,6 @@
 import {Vertex} from './topo/vertex';
-import {veqXYZ} from '../../../modules/geom/tolerance';
-import {Point} from '../../../modules/geom/point';
+import {veqXYZ} from '../geom/tolerance';
+import {Point} from '../geom/point';
 
 export default class VertexFactory {
 
diff --git a/web/app/cad/craft/booleanOperation.js b/web/app/cad/craft/booleanOperation.js
index c8b54302..20b06908 100644
--- a/web/app/cad/craft/booleanOperation.js
+++ b/web/app/cad/craft/booleanOperation.js
@@ -1,7 +1,7 @@
-import {intersect, subtract, union} from '../../brep/operations/boolean';
-import {update as updateStitching} from '../../brep/stitching';
-import {BREPValidator} from '../../brep/brep-validator';
-import {Shell} from '../../brep/topo/shell';
+import {intersect, subtract, union} from '../../../../modules/brep/operations/boolean';
+import {update as updateStitching} from '../../../../modules/brep/stitching';
+import {BREPValidator} from '../../../../modules/brep/brep-validator';
+import {Shell} from '../../../../modules/brep/topo/shell';
 import {MBrepShell} from '../model/mshell';
 
 const BoolOpMap = {
diff --git a/web/app/cad/craft/cutExtrude/cutExtrude.js b/web/app/cad/craft/cutExtrude/cutExtrude.js
index 617b7615..751910a3 100644
--- a/web/app/cad/craft/cutExtrude/cutExtrude.js
+++ b/web/app/cad/craft/cutExtrude/cutExtrude.js
@@ -1,4 +1,4 @@
-import {enclose} from '../../../brep/brep-enclose'
+import {enclose} from '../../../../../modules/brep/brep-enclose'
 import {BooleanOperation, combineShells} from '../booleanOperation'
 import {Matrix3x4} from 'math/matrix';
 import {equal} from 'math/equality';
diff --git a/web/app/cad/debugPlugin.js b/web/app/cad/debugPlugin.js
index d392a1cb..47bf105e 100644
--- a/web/app/cad/debugPlugin.js
+++ b/web/app/cad/debugPlugin.js
@@ -6,7 +6,7 @@ import Vector from 'math/vector';
 import * as vec from 'math/vec';
 import React from 'react';
 import {readSketchFloat} from './sketch/sketchReader';
-import {toLoops} from '../brep/io/brepLoopsFormat';
+import {toLoops} from '../../../modules/brep/io/brepLoopsFormat';
 import curveTess from '../../../modules/geom/impl/curve/curve-tess';
 import {LOG_FLAGS} from './logFlags';
 import {state} from "lstream";
diff --git a/web/app/cad/exposure/exposure.js b/web/app/cad/exposure/exposure.js
index 7408747d..e4965723 100644
--- a/web/app/cad/exposure/exposure.js
+++ b/web/app/cad/exposure/exposure.js
@@ -1,14 +1,14 @@
-import * as BREPPrimitives from '../../brep/brep-primitives'
-import BrepBuilder, {createBoundingSurface} from '../../brep/brep-builder'
-import {createPrism} from '../../brep/brep-enclose'
-import * as BREPBool from '../../brep/operations/boolean'
-import * as IO from '../../brep/io/brepLoopsFormat'
-import {BREPValidator} from '../../brep/brep-validator'
-import {Edge} from '../../brep/topo/edge';
-import {Loop} from '../../brep/topo/loop';
-import {Face} from '../../brep/topo/face';
-import {Shell} from '../../brep/topo/shell';
-import {Vertex} from '../../brep/topo/vertex';
+import * as BREPPrimitives from '../../../../modules/brep/brep-primitives'
+import BrepBuilder, {createBoundingSurface} from '../../../../modules/brep/brep-builder'
+import {createPrism} from '../../../../modules/brep/brep-enclose'
+import * as BREPBool from '../../../../modules/brep/operations/boolean'
+import * as IO from '../../../../modules/brep/io/brepLoopsFormat'
+import {BREPValidator} from '../../../../modules/brep/brep-validator'
+import {Edge} from '../../../../modules/brep/topo/edge';
+import {Loop} from '../../../../modules/brep/topo/loop';
+import {Face} from '../../../../modules/brep/topo/face';
+import {Shell} from '../../../../modules/brep/topo/shell';
+import {Vertex} from '../../../../modules/brep/topo/vertex';
 import {Point} from '../../../../modules/geom/point';
 import BrepCurve from '../../../../modules/geom/curves/brepCurve';
 import {Plane} from '../../../../modules/geom/impl/plane';
diff --git a/web/app/cad/legacy/brep/revolve.js b/web/app/cad/legacy/brep/revolve.js
index 43c4415f..45f4f09d 100644
--- a/web/app/cad/legacy/brep/revolve.js
+++ b/web/app/cad/legacy/brep/revolve.js
@@ -1,6 +1,6 @@
 import {BooleanOperation, combineShells} from './boolean-operation'
 import {ReadSketchFromFace} from '../../sketch/sketchReader'
-import {revolve} from '../../../brep/brep-builder'
+import {revolve} from '../../../../../modules/brep/brep-builder'
 
 export function Revolve(app, params) {
 
diff --git a/web/app/cad/legacy/brep/wizards/revolve-wizard.js b/web/app/cad/legacy/brep/wizards/revolve-wizard.js
index 3aa9adac..38e4f861 100644
--- a/web/app/cad/legacy/brep/wizards/revolve-wizard.js
+++ b/web/app/cad/legacy/brep/wizards/revolve-wizard.js
@@ -1,7 +1,7 @@
 import {CURRENT_SELECTION as S} from './wizard'
 import {PreviewWizard, SketchBasedNurbsPreviewer } from './preview-wizard'
 import {TriangulatePolygons} from '../../../tess/triangulation'
-import {revolveToWallNurbs} from '../../../../brep/brep-builder'
+import {revolveToWallNurbs} from '../../../../../../modules/brep/brep-builder'
 import {evalPivot} from '../revolve'
 import Vector from 'math/vector';
 
diff --git a/web/app/cad/model/surfacePrototype.js b/web/app/cad/model/surfacePrototype.js
index 8eae42a9..4fff7bca 100644
--- a/web/app/cad/model/surfacePrototype.js
+++ b/web/app/cad/model/surfacePrototype.js
@@ -1,4 +1,4 @@
-import {createBoundingSurfaceFrom2DPoints} from '../../brep/brep-builder';
+import {createBoundingSurfaceFrom2DPoints} from '../../../../modules/brep/brep-builder';
 import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface';
 import {BrepSurface} from '../../../../modules/geom/surfaces/brepSurface';
 
diff --git a/web/app/cad/sandbox.js b/web/app/cad/sandbox.js
index 4643f308..6b6d1a3b 100644
--- a/web/app/cad/sandbox.js
+++ b/web/app/cad/sandbox.js
@@ -1,5 +1,5 @@
-import BrepBuilder from '../brep/brep-builder'
-import * as BREPPrimitives from '../brep/brep-primitives'
+import BrepBuilder from '../../../modules/brep/brep-builder'
+import * as BREPPrimitives from '../../../modules/brep/brep-primitives'
 import BrepCurve from '../../../modules/geom/curves/brepCurve';
 import NurbsCurve from "../../../modules/geom/curves/nurbsCurve";
 import {surfaceIntersect} from '../../../modules/geom/intersection/surfaceSurface';
diff --git a/web/app/cad/scene/selectionMarker/selectionMarker.js b/web/app/cad/scene/selectionMarker/selectionMarker.js
index a907a784..f2cdf5c0 100644
--- a/web/app/cad/scene/selectionMarker/selectionMarker.js
+++ b/web/app/cad/scene/selectionMarker/selectionMarker.js
@@ -1,4 +1,4 @@
-import * as stitching from '../../../brep/stitching'
+import * as stitching from '../../../../../modules/brep/stitching'
 import {AbstractSelectionMarker, setFacesColor} from "./abstractSelectionMarker";
 
 export class SelectionMarker extends AbstractSelectionMarker {
diff --git a/web/app/cad/scene/wrappers/entityIO.js b/web/app/cad/scene/wrappers/entityIO.js
index 8ac37f4c..5376696d 100644
--- a/web/app/cad/scene/wrappers/entityIO.js
+++ b/web/app/cad/scene/wrappers/entityIO.js
@@ -1,4 +1,4 @@
-import {readBrep} from '../../../brep/io/brepIO';
+import {readBrep} from '../../../../../modules/brep/io/brepIO';
 import {MBrepShell} from '../../model/mshell';
 import CSys from '../../../../../modules/math/csys';
 
diff --git a/web/app/cad/scene/wrappers/planeSceneObject.js b/web/app/cad/scene/wrappers/planeSceneObject.js
index 69604c7b..42ef9f87 100644
--- a/web/app/cad/scene/wrappers/planeSceneObject.js
+++ b/web/app/cad/scene/wrappers/planeSceneObject.js
@@ -1,6 +1,6 @@
 import Vector from 'math/vector';
 import {SceneFace, SceneSolid} from './sceneObject';
-import {createBoundingSurfaceFrom2DPoints} from '../../../brep/brep-builder';
+import {createBoundingSurfaceFrom2DPoints} from '../../../../../modules/brep/brep-builder';
 
 const INIT_WIDTH_H  = 750 * 0.5;
 const INIT_HEIGHT_H = 750 * 0.5;
diff --git a/web/app/cad/tess/triangulation.js b/web/app/cad/tess/triangulation.js
index fd59fc6d..7f48f321 100644
--- a/web/app/cad/tess/triangulation.js
+++ b/web/app/cad/tess/triangulation.js
@@ -1,6 +1,6 @@
 import libtess from 'libtess'
 import {Point} from '../../../../modules/geom/point'
-import {Vertex} from '../../brep/topo/vertex'
+import {Vertex} from '../../../../modules/brep/topo/vertex'
 import Vector from 'math/vector';
 
 function initTesselator() {