diff --git a/packages/common/src/Expressions/Expressions.ts b/packages/common/src/Expressions/Expressions.ts
index 4e85a22d1..c249c5f8a 100644
--- a/packages/common/src/Expressions/Expressions.ts
+++ b/packages/common/src/Expressions/Expressions.ts
@@ -17,8 +17,7 @@
  * License-Filename: LICENSE
  */
 import {Context, Expression, JSONExpression} from './Expression';
-import {ExpressionParser} from '@here/xyz-maps-common';
-import {Definitions, Value} from './ExpressionParser';
+import {ExpressionParser} from './ExpressionParser';
 
 export * from './MathExpressions';
 export * from './LogicalExpressions';
diff --git a/packages/core/src/features/Feature.ts b/packages/core/src/features/Feature.ts
index 6446c08fb..d24806169 100644
--- a/packages/core/src/features/Feature.ts
+++ b/packages/core/src/features/Feature.ts
@@ -20,7 +20,7 @@
 import {JSUtils} from '@here/xyz-maps-common';
 import {FeatureProvider} from '../providers/FeatureProvider';
 import {GeoJSONFeature, GeoJSONBBox, GeoJSONCoordinate} from './GeoJSON';
-import {TileLayer} from '@here/xyz-maps-core';
+import {TileLayer} from '../layers/TileLayer';
 
 /**
  * represents a Feature in GeoJSON Feature format.
diff --git a/packages/core/src/features/RTree.ts b/packages/core/src/features/RTree.ts
index 5895b59f6..966305fd0 100644
--- a/packages/core/src/features/RTree.ts
+++ b/packages/core/src/features/RTree.ts
@@ -18,8 +18,7 @@
  */
 
 import RBush from 'rbush/rbush.min.js';
-import {Feature} from './Feature';
-import {GeoJSONFeature} from '@here/xyz-maps-core';
+import {GeoJSONFeature} from './GeoJSON';
 
 type BBox = {
     minX: number,
diff --git a/packages/core/src/features/utils.ts b/packages/core/src/features/utils.ts
index 52cacf646..ef3050024 100644
--- a/packages/core/src/features/utils.ts
+++ b/packages/core/src/features/utils.ts
@@ -17,8 +17,7 @@
  * License-Filename: LICENSE
  */
 
-import {Feature} from '../features/Feature';
-import {GeoJSONCoordinate, GeoJSONFeature} from '@here/xyz-maps-core';
+import {GeoJSONCoordinate, GeoJSONFeature} from './GeoJSON';
 type Point = number[];
 type BBox = number[];
 type Coordinates = Array<Point>;
diff --git a/packages/core/src/layers/cluster/ClusterTileLayerOptions.ts b/packages/core/src/layers/cluster/ClusterTileLayerOptions.ts
index 4625104bb..95c53cefb 100644
--- a/packages/core/src/layers/cluster/ClusterTileLayerOptions.ts
+++ b/packages/core/src/layers/cluster/ClusterTileLayerOptions.ts
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 import {TileLayerOptions} from '../TileLayerOptions';
-import {FeatureProvider} from '@here/xyz-maps-core';
+import {FeatureProvider} from '../../providers/FeatureProvider';
 import {ClusterFeatureProperties} from '../../features/ClusterFeature';
 
 /**
diff --git a/packages/core/src/providers/GeoSpace/SpaceProvider.ts b/packages/core/src/providers/GeoSpace/SpaceProvider.ts
index 9fb076865..283fddcb0 100644
--- a/packages/core/src/providers/GeoSpace/SpaceProvider.ts
+++ b/packages/core/src/providers/GeoSpace/SpaceProvider.ts
@@ -16,7 +16,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * License-Filename: LICENSE
  */
-import {GeoJSONFeature} from '@here/xyz-maps-core';
+import {GeoJSONFeature} from '../../features/GeoJSON';
 
 
 import {JSUtils, Queue} from '@here/xyz-maps-common';
diff --git a/packages/core/src/providers/RemoteTileProvider/FixedLevelTileLoadDelegator.ts b/packages/core/src/providers/RemoteTileProvider/FixedLevelTileLoadDelegator.ts
index b67e4d7d0..da68fce19 100644
--- a/packages/core/src/providers/RemoteTileProvider/FixedLevelTileLoadDelegator.ts
+++ b/packages/core/src/providers/RemoteTileProvider/FixedLevelTileLoadDelegator.ts
@@ -22,7 +22,7 @@ import TileReceiver from './TileReceiver';
 import {Tile} from '../../tile/Tile';
 import TileProvider from '../TileProvider/TileProvider';
 import {TileLoadDelegator} from './TileLoadDelegator';
-import {tileUtils} from '@here/xyz-maps-core';
+import {tileUtils} from '../../tile/TileUtils';
 
 let UNDEF;
 
diff --git a/packages/core/src/providers/RemoteTileProvider/TileReceiver.ts b/packages/core/src/providers/RemoteTileProvider/TileReceiver.ts
index 3387f0d16..c9ea32137 100644
--- a/packages/core/src/providers/RemoteTileProvider/TileReceiver.ts
+++ b/packages/core/src/providers/RemoteTileProvider/TileReceiver.ts
@@ -18,7 +18,7 @@
  */
 
 import {Tile} from '../../tile/Tile';
-import {FeatureProvider} from '@here/xyz-maps-core';
+import {FeatureProvider} from '../FeatureProvider';
 
 let UNDEF;
 
diff --git a/packages/core/src/route/Route.ts b/packages/core/src/route/Route.ts
index 4e37b7d9a..17aad84af 100644
--- a/packages/core/src/route/Route.ts
+++ b/packages/core/src/route/Route.ts
@@ -17,7 +17,8 @@
  * License-Filename: LICENSE
  */
 import {AStar, AStarNode, geotools} from '@here/xyz-maps-common';
-import {Feature, FeatureProvider} from '@here/xyz-maps-core';
+import {FeatureProvider} from '../providers/FeatureProvider';
+import {Feature} from '../features/Feature';
 
 type NodeData = { link: Feature, index: number };
 
diff --git a/packages/core/src/styles/GenericStyle.ts b/packages/core/src/styles/GenericStyle.ts
index 6bd6c0341..1f5d459c7 100644
--- a/packages/core/src/styles/GenericStyle.ts
+++ b/packages/core/src/styles/GenericStyle.ts
@@ -17,8 +17,7 @@
  * License-Filename: LICENSE
  */
 import {Color, StyleExpression, StyleValueFunction, StyleZoomRange} from './LayerStyle';
-import {LinearGradient} from '@here/xyz-maps-core';
-import {JSONExpression} from '@here/xyz-maps-common';
+import {LinearGradient} from './HeatmapStyle';
 
 /**
  * The Style object defines how certain features should be rendered.
diff --git a/packages/editor/src/features/ObjectManager.ts b/packages/editor/src/features/ObjectManager.ts
index 650adeaed..c6be08a65 100644
--- a/packages/editor/src/features/ObjectManager.ts
+++ b/packages/editor/src/features/ObjectManager.ts
@@ -30,7 +30,7 @@ import {Map, JSUtils, geotools, vec3} from '@here/xyz-maps-common';
 import {getClosestPntOnLine, intersectBBox, rayIntersectPlane} from '../geometry';
 import {Navlink} from './link/Navlink';
 import InternalEditor from '../IEditor';
-import {Feature} from '@here/xyz-maps-editor';
+import {Feature} from './feature/Feature';
 
 type Options = {
     ignore?: (feature: Navlink) => boolean
diff --git a/packages/editor/src/features/area/VirtualShape.ts b/packages/editor/src/features/area/VirtualShape.ts
index ea1f1c7c1..45f5d791c 100644
--- a/packages/editor/src/features/area/VirtualShape.ts
+++ b/packages/editor/src/features/area/VirtualShape.ts
@@ -20,7 +20,7 @@
 import InternalEditor from '../../IEditor';
 import {Feature, FeatureProvider, GeoJSONFeature} from '@here/xyz-maps-core';
 import {Area} from './Area';
-import {AreaShape} from '@here/xyz-maps-editor';
+import {AreaShape} from './AreaShape';
 
 let UNDEF;
 
diff --git a/packages/editor/src/features/line/LineTools.ts b/packages/editor/src/features/line/LineTools.ts
index ce2b475c5..7adca664a 100644
--- a/packages/editor/src/features/line/LineTools.ts
+++ b/packages/editor/src/features/line/LineTools.ts
@@ -21,7 +21,7 @@
 import {LineShape} from './LineShape';
 import {getSegmentIndex, getPntAt} from '../../geometry';
 import VirtualShape from './VirtualShape';
-import {Line} from '@here/xyz-maps-editor';
+import {Line} from './Line';
 import {GeoJSONCoordinate} from '@here/xyz-maps-core';
 import FeatureTools from '../feature/FeatureTools';
 
diff --git a/packages/editor/src/features/link/NavlinkShape.ts b/packages/editor/src/features/link/NavlinkShape.ts
index bc297614f..9d9366776 100644
--- a/packages/editor/src/features/link/NavlinkShape.ts
+++ b/packages/editor/src/features/link/NavlinkShape.ts
@@ -24,7 +24,7 @@ import {Navlink} from './Navlink';
 import {TurnRestrictionEditor} from '../../tools/turnrestriction/TrEditor';
 import {Feature as EditableFeature} from '../feature/Feature';
 import NavlinkTools from './NavlinkTools';
-import {defaultBehavior} from '@here/xyz-maps-editor';
+import {defaultBehavior} from '../line/LineShape';
 import {dragFeatureCoordinate} from '../oTools';
 import {Coordinate} from '../line/LineTools';
 
diff --git a/packages/editor/src/features/location/LocationTools.ts b/packages/editor/src/features/location/LocationTools.ts
index 34f75d968..84d07505b 100644
--- a/packages/editor/src/features/location/LocationTools.ts
+++ b/packages/editor/src/features/location/LocationTools.ts
@@ -26,7 +26,7 @@ import {Navlink} from '../link/Navlink';
 import {EditableFeatureProvider, GeoJSONCoordinate} from '@here/xyz-maps-core';
 import {JSUtils} from '@here/xyz-maps-common';
 import {Location} from './Location';
-import {Feature} from '@here/xyz-maps-editor';
+import {Feature} from '../feature/Feature';
 import FeatureTools from '../feature/FeatureTools';
 import {dragFeatureCoordinate} from '../oTools';
 
diff --git a/packages/editor/src/features/oTools.ts b/packages/editor/src/features/oTools.ts
index 89fdf0448..6615cd2cf 100644
--- a/packages/editor/src/features/oTools.ts
+++ b/packages/editor/src/features/oTools.ts
@@ -23,11 +23,10 @@ import LineTools from './line/LineTools';
 import NavlinkTools from './link/NavlinkTools';
 import LocationTools from './location/LocationTools';
 import {Feature} from './feature/Feature';
-import {Marker} from '@here/xyz-maps-editor';
+import {Marker} from './marker/Marker';
 import {geotools, vec3} from '@here/xyz-maps-common';
 import {getClosestPntOnLine, rayIntersectPlane} from '../geometry';
 import InternalEditor from '../IEditor';
-import {GeoJSONCoordinate} from '@here/xyz-maps-core';
 
 const tools = {
     MARKER: MarkerTools,
diff --git a/packages/editor/src/tools/rangeSelector/MultiSelector.ts b/packages/editor/src/tools/rangeSelector/MultiSelector.ts
index 9bb5989eb..379a3e97b 100644
--- a/packages/editor/src/tools/rangeSelector/MultiSelector.ts
+++ b/packages/editor/src/tools/rangeSelector/MultiSelector.ts
@@ -24,7 +24,7 @@ import {Map} from '@here/xyz-maps-display';
 import {Navlink} from '../../features/link/Navlink';
 import {InternalRangeOptions} from './Range';
 import {GeoJSONCoordinate, GeoJSONFeature} from '@here/xyz-maps-core';
-import {Feature} from '@here/xyz-maps-editor';
+import {Feature} from '../../features/feature/Feature';
 
 type LineSegment = { id: number | string, coordinates: GeoJSONCoordinate[], feature?: Navlink | GeoJSONFeature };