diff --git a/web/app/cad/cad-utils.js b/web/app/cad/cad-utils.js
index b9a6cad4..f6a822d5 100644
--- a/web/app/cad/cad-utils.js
+++ b/web/app/cad/cad-utils.js
@@ -4,7 +4,6 @@ import {HashTable} from '../utils/hashmap'
 import {Graph} from '../math/graph'
 import * as math from '../math/math'
 import {Matrix3, AXIS, ORIGIN} from '../math/l3space'
-import Counters from './counters'
 import {MeshSceneSolid} from './scene/wrappers/meshSceneObject'
 
 export const FACE_COLOR =  0xB0C4DE;
@@ -548,3 +547,7 @@ export function arrFlatten1L(arr) {
   }
   return result;
 }
+
+const Counters = {
+  shared : 0
+};
\ No newline at end of file
diff --git a/web/app/cad/counters.js b/web/app/cad/counters.js
deleted file mode 100644
index ec171101..00000000
--- a/web/app/cad/counters.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-const Counters = {
-  solid : 0,
-  shared : 0
-};
-
-export default Counters;
\ No newline at end of file
diff --git a/web/app/cad/craft/mesh/wizards/import.js b/web/app/cad/craft/mesh/wizards/import.js
index fa7b7edb..a4c69c56 100644
--- a/web/app/cad/craft/mesh/wizards/import.js
+++ b/web/app/cad/craft/mesh/wizards/import.js
@@ -1,9 +1,6 @@
 import * as tk from '../../../../ui/toolkit.js'
-import * as workbench from '../workbench'
-import * as cad_utils from '../../../cad-utils'
-import Vector from 'math/vector';
 import {Wizard} from './wizard-commons'
-import {LoadSTLFromURL} from '../../../io'
+import {LoadSTLFromURL} from '../../../stl/io'
 
 export function ImportWizard(viewer, initParams) {
   Wizard.call(this, viewer, initParams);
diff --git a/web/app/cad/craft/mesh/workbench.js b/web/app/cad/craft/mesh/workbench.js
index d92132b8..aacc3c5e 100644
--- a/web/app/cad/craft/mesh/workbench.js
+++ b/web/app/cad/craft/mesh/workbench.js
@@ -1,11 +1,8 @@
 import Vector from 'math/vector';
 import * as cad_utils from '../../cad-utils'
 import * as math from '../../../math/math'
-import {LUT} from '../../../math/bezier-cubic'
-import {Matrix3, AXIS, ORIGIN} from '../../../math/l3space'
 import {HashTable} from '../../../utils/hashmap'
 import {Mesh} from '../../mesh'
-import {LoadSTLFromURL} from '../../io'
 import revolve from './revolve'
 import {Triangulate} from '../../tess/triangulation'
 
diff --git a/web/app/cad/scene/wrappers/meshSceneObject.js b/web/app/cad/scene/wrappers/meshSceneObject.js
index 0de3d8b3..b0ff8dbb 100644
--- a/web/app/cad/scene/wrappers/meshSceneObject.js
+++ b/web/app/cad/scene/wrappers/meshSceneObject.js
@@ -1,11 +1,7 @@
 import {HashTable} from '../../../utils/hashmap'
-import Vector from 'math/vector';
-import Counters from '../../counters'
-import {findOutline, segmentsToPaths, reconstructSketchBounds} from '../../craft/mesh/workbench'
-import {Matrix3, AXIS} from '../../../math/l3space'
-import {arrFlatten1L, isCurveClass} from '../../cad-utils'
-import DPR from 'dpr'
-import {SceneSolid, SceneFace} from './sceneObject'
+import {findOutline, reconstructSketchBounds, segmentsToPaths} from '../../craft/mesh/workbench'
+import {isCurveClass} from '../../cad-utils'
+import {SceneFace, SceneSolid} from './sceneObject'
 
 export class MeshSceneSolid extends SceneSolid {
   
diff --git a/web/app/cad/io.js b/web/app/cad/stl/io.js
similarity index 100%
rename from web/app/cad/io.js
rename to web/app/cad/stl/io.js