diff --git a/core/src/main/java/ru/trader/analysis/graph/CCrawler.java b/core/src/main/java/ru/trader/analysis/graph/CCrawler.java
index d428f6c..01bec4a 100644
--- a/core/src/main/java/ru/trader/analysis/graph/CCrawler.java
+++ b/core/src/main/java/ru/trader/analysis/graph/CCrawler.java
@@ -6,7 +6,6 @@ import ru.trader.analysis.AnalysisCallBack;
 import ru.trader.analysis.RouteSpecification;
 import ru.trader.core.Profile;
 import ru.trader.core.Ship;
-import ru.trader.graph.Connectable;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/core/src/main/java/ru/trader/graph/Connectable.java b/core/src/main/java/ru/trader/analysis/graph/Connectable.java
similarity index 81%
rename from core/src/main/java/ru/trader/graph/Connectable.java
rename to core/src/main/java/ru/trader/analysis/graph/Connectable.java
index a8c3060..ddc6a23 100644
--- a/core/src/main/java/ru/trader/graph/Connectable.java
+++ b/core/src/main/java/ru/trader/analysis/graph/Connectable.java
@@ -1,4 +1,4 @@
-package ru.trader.graph;
+package ru.trader.analysis.graph;
 
 public interface Connectable<T> extends Comparable<Connectable<T>>{
 
diff --git a/core/src/main/java/ru/trader/analysis/graph/ConnectibleEdge.java b/core/src/main/java/ru/trader/analysis/graph/ConnectibleEdge.java
index 966fcb5..f284184 100644
--- a/core/src/main/java/ru/trader/analysis/graph/ConnectibleEdge.java
+++ b/core/src/main/java/ru/trader/analysis/graph/ConnectibleEdge.java
@@ -1,7 +1,5 @@
 package ru.trader.analysis.graph;
 
-import ru.trader.graph.Connectable;
-
 public class ConnectibleEdge<T extends Connectable<T>> extends Edge<T> {
     protected double refill;
     protected double fuelCost;
diff --git a/core/src/main/java/ru/trader/analysis/graph/ConnectibleGraph.java b/core/src/main/java/ru/trader/analysis/graph/ConnectibleGraph.java
index 002c68a..e904ac8 100644
--- a/core/src/main/java/ru/trader/analysis/graph/ConnectibleGraph.java
+++ b/core/src/main/java/ru/trader/analysis/graph/ConnectibleGraph.java
@@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory;
 import ru.trader.analysis.AnalysisCallBack;
 import ru.trader.core.Profile;
 import ru.trader.core.Ship;
-import ru.trader.graph.Connectable;
 
 import java.util.Collection;
 
diff --git a/core/src/main/java/ru/trader/analysis/graph/Path.java b/core/src/main/java/ru/trader/analysis/graph/Path.java
index 9579929..197aac4 100644
--- a/core/src/main/java/ru/trader/analysis/graph/Path.java
+++ b/core/src/main/java/ru/trader/analysis/graph/Path.java
@@ -1,7 +1,6 @@
 package ru.trader.analysis.graph;
 
 import ru.trader.core.Ship;
-import ru.trader.graph.Connectable;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/src/main/java/ru/trader/core/AbstractItemStat.java b/core/src/main/java/ru/trader/core/AbstractItemStat.java
index 5a610ad..8d3989f 100644
--- a/core/src/main/java/ru/trader/core/AbstractItemStat.java
+++ b/core/src/main/java/ru/trader/core/AbstractItemStat.java
@@ -1,6 +1,6 @@
 package ru.trader.core;
 
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/src/main/java/ru/trader/core/AbstractPlace.java b/core/src/main/java/ru/trader/core/AbstractPlace.java
index e661023..d897a3c 100644
--- a/core/src/main/java/ru/trader/core/AbstractPlace.java
+++ b/core/src/main/java/ru/trader/core/AbstractPlace.java
@@ -3,7 +3,7 @@ package ru.trader.core;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ru/trader/core/AbstractVendor.java b/core/src/main/java/ru/trader/core/AbstractVendor.java
index 632fd2f..397c8dd 100644
--- a/core/src/main/java/ru/trader/core/AbstractVendor.java
+++ b/core/src/main/java/ru/trader/core/AbstractVendor.java
@@ -3,7 +3,7 @@ package ru.trader.core;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ru/trader/core/Place.java b/core/src/main/java/ru/trader/core/Place.java
index 7b52001..04149b0 100644
--- a/core/src/main/java/ru/trader/core/Place.java
+++ b/core/src/main/java/ru/trader/core/Place.java
@@ -1,6 +1,6 @@
 package ru.trader.core;
 
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/src/main/java/ru/trader/core/TransitVendor.java b/core/src/main/java/ru/trader/core/TransitVendor.java
index 791b930..29cb80a 100644
--- a/core/src/main/java/ru/trader/core/TransitVendor.java
+++ b/core/src/main/java/ru/trader/core/TransitVendor.java
@@ -1,6 +1,6 @@
 package ru.trader.core;
 
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/src/main/java/ru/trader/core/Vendor.java b/core/src/main/java/ru/trader/core/Vendor.java
index e98aaf1..131c0ea 100644
--- a/core/src/main/java/ru/trader/core/Vendor.java
+++ b/core/src/main/java/ru/trader/core/Vendor.java
@@ -1,6 +1,6 @@
 package ru.trader.core;
 
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/src/test/java/ru/trader/analysis/graph/Point.java b/core/src/test/java/ru/trader/analysis/graph/Point.java
index 7c279d9..8006626 100644
--- a/core/src/test/java/ru/trader/analysis/graph/Point.java
+++ b/core/src/test/java/ru/trader/analysis/graph/Point.java
@@ -1,7 +1,6 @@
 package ru.trader.analysis.graph;
 
 import org.jetbrains.annotations.NotNull;
-import ru.trader.graph.Connectable;
 
 import java.util.Objects;