diff --git a/src/app/cartography/map/map.component.ts b/src/app/cartography/map/map.component.ts
index b7a0bf18..22bcd24e 100644
--- a/src/app/cartography/map/map.component.ts
+++ b/src/app/cartography/map/map.component.ts
@@ -7,7 +7,7 @@ import {select, Selection} from 'd3-selection';
 import { Node } from "../shared/models/node";
 import { Link } from "../shared/models/link";
 import { GraphLayout } from "../shared/widgets/graph.widget";
-import { Context } from "../../map/models/context";
+import { Context } from "../shared/models/context";
 import { Size } from "../shared/models/size";
 import { Drawing } from "../shared/models/drawing";
 import {Symbol} from "../shared/models/symbol";
diff --git a/src/app/map/models/context.ts b/src/app/cartography/shared/models/context.ts
similarity index 73%
rename from src/app/map/models/context.ts
rename to src/app/cartography/shared/models/context.ts
index 28319b38..2399beba 100644
--- a/src/app/map/models/context.ts
+++ b/src/app/cartography/shared/models/context.ts
@@ -1,6 +1,6 @@
-import {Size} from "../../cartography/shared/models/size";
-import {Selection} from "d3-selection";
-import {Point} from "../../cartography/shared/models/point";
+import {Size} from "./size";
+import {Point} from "./point";
+
 
 export class Context {
   private size: Size;
diff --git a/src/app/map/models/types.ts b/src/app/cartography/shared/models/types.ts
similarity index 100%
rename from src/app/map/models/types.ts
rename to src/app/cartography/shared/models/types.ts
diff --git a/src/app/cartography/shared/tool.ts b/src/app/cartography/shared/tool.ts
index 1cc8c4f9..714fb2c7 100644
--- a/src/app/cartography/shared/tool.ts
+++ b/src/app/cartography/shared/tool.ts
@@ -1,4 +1,4 @@
-import {SVGSelection} from "../../map/models/types";
+import {SVGSelection} from "./models/types";
 
 export interface Tool {
   connect(selection: SVGSelection);
diff --git a/src/app/cartography/shared/tools/moving-tool.spec.ts b/src/app/cartography/shared/tools/moving-tool.spec.ts
index 33fc6b58..d8333f41 100644
--- a/src/app/cartography/shared/tools/moving-tool.spec.ts
+++ b/src/app/cartography/shared/tools/moving-tool.spec.ts
@@ -1,6 +1,6 @@
 import { select } from "d3-selection";
-import { Context } from "../../../map/models/context";
-import { SVGSelection } from "../../../map/models/types";
+import { Context } from "../models/context";
+import { SVGSelection } from "../models/types";
 import { MovingTool } from "./moving-tool";
 
 
diff --git a/src/app/cartography/shared/tools/moving-tool.ts b/src/app/cartography/shared/tools/moving-tool.ts
index f326f4fd..f954b9f0 100644
--- a/src/app/cartography/shared/tools/moving-tool.ts
+++ b/src/app/cartography/shared/tools/moving-tool.ts
@@ -1,5 +1,5 @@
-import {SVGSelection} from "../../../map/models/types";
-import {Context} from "../../../map/models/context";
+import {SVGSelection} from "../models/types";
+import {Context} from "../models/context";
 import {D3ZoomEvent, zoom, ZoomBehavior} from "d3-zoom";
 import { event } from "d3-selection";
 
diff --git a/src/app/cartography/shared/tools/selection-tool.spec.ts b/src/app/cartography/shared/tools/selection-tool.spec.ts
index 50375d4b..b5b8bc7f 100644
--- a/src/app/cartography/shared/tools/selection-tool.spec.ts
+++ b/src/app/cartography/shared/tools/selection-tool.spec.ts
@@ -1,8 +1,8 @@
 import { select } from "d3-selection";
 
 import { SelectionTool } from "./selection-tool";
-import { Context } from "../../../map/models/context";
-import { SVGSelection } from "../../../map/models/types";
+import { Context } from "../models/context";
+import { SVGSelection } from "../models/types";
 import { Rectangle } from "../models/rectangle";
 
 
diff --git a/src/app/cartography/shared/tools/selection-tool.ts b/src/app/cartography/shared/tools/selection-tool.ts
index 8e05ff3d..f7bc4f6e 100644
--- a/src/app/cartography/shared/tools/selection-tool.ts
+++ b/src/app/cartography/shared/tools/selection-tool.ts
@@ -1,9 +1,10 @@
-import {SVGSelection} from "../../../map/models/types";
-import {mouse, select} from "d3-selection";
-import {Context} from "../../../map/models/context";
-import {Subject} from "rxjs/Subject";
-import {Rectangle} from "../models/rectangle";
-import {Injectable} from "@angular/core";
+import { Injectable } from "@angular/core";
+import { mouse, select } from "d3-selection";
+import { Subject } from "rxjs/Subject";
+
+import { SVGSelection } from "../models/types";
+import { Context } from "../models/context";
+import { Rectangle } from "../models/rectangle";
 
 
 @Injectable()
@@ -83,7 +84,6 @@ export class SelectionTool {
   private moveSelection(start, move) {
     this.path.attr("d", this.rect(start[0], start[1], move[0] - start[0], move[1] - start[1]));
     this.selectedEvent(start, move);
-    // this.getSelectedItems(start, move);
   }
 
   private endSelection(start, end) {
diff --git a/src/app/cartography/shared/widgets/drawing-line.widget.ts b/src/app/cartography/shared/widgets/drawing-line.widget.ts
index b0300726..eb5a1ae6 100644
--- a/src/app/cartography/shared/widgets/drawing-line.widget.ts
+++ b/src/app/cartography/shared/widgets/drawing-line.widget.ts
@@ -1,9 +1,9 @@
 import {DrawingLine} from "../models/drawing-line";
-import {SVGSelection} from "../../../map/models/types";
+import {SVGSelection} from "../models/types";
 import {Point} from "../models/point";
 import {line} from "d3-shape";
 import {mouse} from "d3-selection";
-import {Context} from "../../../map/models/context";
+import {Context} from "../models/context";
 
 export class DrawingLineWidget {
   private drawingLine: DrawingLine = new DrawingLine();
diff --git a/src/app/cartography/shared/widgets/drawings.widget.ts b/src/app/cartography/shared/widgets/drawings.widget.ts
index f036e9f2..b6eedd34 100644
--- a/src/app/cartography/shared/widgets/drawings.widget.ts
+++ b/src/app/cartography/shared/widgets/drawings.widget.ts
@@ -1,6 +1,6 @@
 import {Widget} from "./widget";
 import {Drawing} from "../models/drawing";
-import {SVGSelection} from "../../../map/models/types";
+import {SVGSelection} from "../models/types";
 
 
 export class DrawingsWidget implements Widget {
diff --git a/src/app/cartography/shared/widgets/ethernet-link.widget.ts b/src/app/cartography/shared/widgets/ethernet-link.widget.ts
index fe073929..4a3a6d7f 100644
--- a/src/app/cartography/shared/widgets/ethernet-link.widget.ts
+++ b/src/app/cartography/shared/widgets/ethernet-link.widget.ts
@@ -1,5 +1,5 @@
 import {Widget} from "./widget";
-import {SVGSelection} from "../../../map/models/types";
+import {SVGSelection} from "../models/types";
 
 import { line } from "d3-shape";
 import {Link} from "../models/link";
diff --git a/src/app/cartography/shared/widgets/graph.widget.ts b/src/app/cartography/shared/widgets/graph.widget.ts
index 6303f8c6..9cada770 100644
--- a/src/app/cartography/shared/widgets/graph.widget.ts
+++ b/src/app/cartography/shared/widgets/graph.widget.ts
@@ -1,9 +1,9 @@
-import { Context } from "../../../map/models/context";
+import { Context } from "../models/context";
 import { Node } from "../models/node";
 import { Link } from "../models/link";
 import { NodesWidget } from "./nodes.widget";
 import { Widget } from "./widget";
-import { SVGSelection } from "../../../map/models/types";
+import { SVGSelection } from "../models/types";
 import { LinksWidget } from "./links.widget";
 import { Drawing } from "../models/drawing";
 import { DrawingsWidget } from "./drawings.widget";
diff --git a/src/app/cartography/shared/widgets/links.widget.ts b/src/app/cartography/shared/widgets/links.widget.ts
index 063ab9cd..a989ec04 100644
--- a/src/app/cartography/shared/widgets/links.widget.ts
+++ b/src/app/cartography/shared/widgets/links.widget.ts
@@ -1,7 +1,7 @@
 import {BaseType, select, Selection} from "d3-selection";
 
 import { Widget } from "./widget";
-import { SVGSelection } from "../../../map/models/types";
+import { SVGSelection } from "../models/types";
 import { Link } from "../models/link";
 import { LinkStatus } from "../models/link-status";
 import { MultiLinkCalculatorHelper } from "../../map/helpers/multi-link-calculator-helper";
diff --git a/src/app/cartography/shared/widgets/nodes.widget.ts b/src/app/cartography/shared/widgets/nodes.widget.ts
index a041a354..4ef3c7f5 100644
--- a/src/app/cartography/shared/widgets/nodes.widget.ts
+++ b/src/app/cartography/shared/widgets/nodes.widget.ts
@@ -1,6 +1,6 @@
 import { Widget } from "./widget";
 import { Node } from "../models/node";
-import { SVGSelection } from "../../../map/models/types";
+import { SVGSelection } from "../models/types";
 import {event, select} from "d3-selection";
 import {D3DragEvent, drag} from "d3-drag";
 import {Symbol} from "../models/symbol";
diff --git a/src/app/cartography/shared/widgets/serial-link.widget.ts b/src/app/cartography/shared/widgets/serial-link.widget.ts
index 9e70d145..7865acec 100644
--- a/src/app/cartography/shared/widgets/serial-link.widget.ts
+++ b/src/app/cartography/shared/widgets/serial-link.widget.ts
@@ -1,5 +1,5 @@
 import {Widget} from "./widget";
-import {SVGSelection} from "../../../map/models/types";
+import {SVGSelection} from "../models/types";
 import {Link} from "../models/link";
 import { path } from "d3-path";