diff --git a/src/mol-geo/representation/structure/visual/element-sphere.ts b/src/mol-geo/representation/structure/visual/element-sphere.ts
index 7d6fbcbfd8d47c3389e8ef63d9c36677aedb998a..55002bfc9597d1f3ccf470a27af65a658d55a643 100644
--- a/src/mol-geo/representation/structure/visual/element-sphere.ts
+++ b/src/mol-geo/representation/structure/visual/element-sphere.ts
@@ -11,8 +11,8 @@ import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
 import { Unit } from 'mol-model/structure';
 import { DefaultStructureProps, UnitsVisual } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from '../visual/util/common';
-import { createElementSphereMesh, markElement, getElementRadius, getElementLoci } from '../visual/util/element';
+import { createTransforms, createColors } from './util/common';
+import { createElementSphereMesh, markElement, getElementRadius, getElementLoci } from './util/element';
 import { deepEqual } from 'mol-util';
 import { MeshValues } from 'mol-gl/renderable';
 import { getMeshData } from '../../../util/mesh-data';
diff --git a/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts b/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts
index 9068225e5f6c5ef0f2cb0bdafc75f4a0ff46641d..1237923f8ff594a22a1b66ef17dfd7fabaae3e4e 100644
--- a/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts
+++ b/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts
@@ -10,7 +10,7 @@ import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
 import { Unit, Element, StructureProperties } from 'mol-model/structure';
 import { DefaultStructureProps, UnitsVisual } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from '../visual/util/common';
+import { createTransforms, createColors } from './util/common';
 import { deepEqual } from 'mol-util';
 import { MeshValues } from 'mol-gl/renderable';
 import { getMeshData } from '../../../util/mesh-data';
diff --git a/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts b/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
index 6922d4a3bfafcb7aa340ea068c39fe46143b4af3..c5fa69d17e8b9c52f4416e2e8762d4dac700b755 100644
--- a/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
+++ b/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
@@ -10,8 +10,8 @@ import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
 import { Unit, Element, StructureProperties } from 'mol-model/structure';
 import { DefaultStructureProps, UnitsVisual } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from '../visual/util/common';
-import { markElement } from '../visual/util/element';
+import { createTransforms, createColors } from './util/common';
+import { markElement } from './util/element';
 import { deepEqual } from 'mol-util';
 import { MeshValues } from 'mol-gl/renderable';
 import { getMeshData } from '../../../util/mesh-data';
diff --git a/src/mol-gl/renderable/mesh.ts b/src/mol-gl/renderable/mesh.ts
index 562daec704a602fdbe4146b7bb4d9075f8a55a85..e18b88dab04d553e2dc8c21c3f3e93d627ca514a 100644
--- a/src/mol-gl/renderable/mesh.ts
+++ b/src/mol-gl/renderable/mesh.ts
@@ -7,7 +7,7 @@
 import { Renderable, RenderableState, createRenderable } from '../renderable'
 import { Context } from '../webgl/context';
 import { createRenderItem } from '../webgl/render-item';
-import { GlobalUniformSchema, BaseSchema, AttributeSpec, ElementsSpec, DefineSpec, Values, InternalSchema } from '../renderable/schema';
+import { GlobalUniformSchema, BaseSchema, AttributeSpec, ElementsSpec, DefineSpec, Values, InternalSchema } from './schema';
 import { MeshShaderCode } from '../shader-code';
 import { ValueCell } from 'mol-util';
 
diff --git a/src/mol-gl/renderable/point.ts b/src/mol-gl/renderable/point.ts
index a200d4e40e3a1d4e6e8fc359f6276a2739b66f7a..e036a809f105e06b1951504ac7d5265f82e0934a 100644
--- a/src/mol-gl/renderable/point.ts
+++ b/src/mol-gl/renderable/point.ts
@@ -7,7 +7,7 @@
 import { Renderable, RenderableState, createRenderable } from '../renderable'
 import { Context } from '../webgl/context';
 import { createRenderItem } from '../webgl/render-item';
-import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, DefineSpec, Values, InternalSchema } from '../renderable/schema';
+import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, DefineSpec, Values, InternalSchema } from './schema';
 import { PointShaderCode } from '../shader-code';
 import { ValueCell } from 'mol-util';
 
diff --git a/src/mol-task/task.ts b/src/mol-task/task.ts
index 92618a09155ca0b42fa34b8d233b84916723fbe5..7fdf1b36359763018cd7f0d3d4cdba4ddc13379a 100644
--- a/src/mol-task/task.ts
+++ b/src/mol-task/task.ts
@@ -7,7 +7,7 @@
 import { RuntimeContext } from './execution/runtime-context'
 import { Progress } from './execution/progress'
 import { ExecuteObservable, ExecuteObservableChild, ExecuteInContext } from './execution/observable';
-import { SyncRuntimeContext } from 'mol-task/execution/synchronous';
+import { SyncRuntimeContext } from './execution/synchronous';
 import { idFactory } from 'mol-util/id-factory';
 
 /** A "named function wrapper" with built in "computation tree progress tracking". */