diff --git a/DataExtractionOSM/src/com/anvisics/Constants.java b/DataExtractionOSM/src/com/osmand/Constants.java
similarity index 88%
rename from DataExtractionOSM/src/com/anvisics/Constants.java
rename to DataExtractionOSM/src/com/osmand/Constants.java
index c908ba7be0..95b4ee06a9 100644
--- a/DataExtractionOSM/src/com/anvisics/Constants.java
+++ b/DataExtractionOSM/src/com/osmand/Constants.java
@@ -1,4 +1,4 @@
-package com.anvisics;
+package com.osmand;
 
 public interface Constants {
 	
diff --git a/DataExtractionOSM/src/com/anvisics/DataExtraction.java b/DataExtractionOSM/src/com/osmand/DataExtraction.java
similarity index 95%
rename from DataExtractionOSM/src/com/anvisics/DataExtraction.java
rename to DataExtractionOSM/src/com/osmand/DataExtraction.java
index ead4249b6b..b95754b315 100644
--- a/DataExtractionOSM/src/com/anvisics/DataExtraction.java
+++ b/DataExtractionOSM/src/com/osmand/DataExtraction.java
@@ -1,4 +1,4 @@
-package com.anvisics;
+package com.osmand;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -55,12 +55,12 @@ import org.openstreetmap.osmosis.core.task.v0_6.Sink;
 import org.openstreetmap.osmosis.core.xml.v0_6.impl.OsmHandler;
 import org.xml.sax.SAXException;
 
-import com.anvisics.MapPanel.IMapLocationListener;
-import com.anvisics.NodeUtil.LatLon;
-import com.anvisics.data.City;
-import com.anvisics.data.Region;
-import com.anvisics.data.Street;
-import com.anvisics.data.City.CityType;
+import com.osmand.MapPanel.IMapLocationListener;
+import com.osmand.NodeUtil.LatLon;
+import com.osmand.data.City;
+import com.osmand.data.Region;
+import com.osmand.data.Street;
+import com.osmand.data.City.CityType;
 
 
 // TO implement
diff --git a/DataExtractionOSM/src/com/anvisics/MapPanel.java b/DataExtractionOSM/src/com/osmand/MapPanel.java
similarity index 95%
rename from DataExtractionOSM/src/com/anvisics/MapPanel.java
rename to DataExtractionOSM/src/com/osmand/MapPanel.java
index bc76679b03..1c8c3b4694 100644
--- a/DataExtractionOSM/src/com/anvisics/MapPanel.java
+++ b/DataExtractionOSM/src/com/osmand/MapPanel.java
@@ -1,4 +1,4 @@
-package com.anvisics;
+package com.osmand;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -23,7 +23,7 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 
-import com.anvisics.DataExtraction.ExitListener;
+import com.osmand.DataExtraction.ExitListener;
 
 public class MapPanel extends JPanel {
 	
diff --git a/DataExtractionOSM/src/com/anvisics/NodeUtil.java b/DataExtractionOSM/src/com/osmand/NodeUtil.java
similarity index 95%
rename from DataExtractionOSM/src/com/anvisics/NodeUtil.java
rename to DataExtractionOSM/src/com/osmand/NodeUtil.java
index 8bd78a6f5a..7db4507960 100644
--- a/DataExtractionOSM/src/com/anvisics/NodeUtil.java
+++ b/DataExtractionOSM/src/com/osmand/NodeUtil.java
@@ -1,4 +1,4 @@
-package com.anvisics;
+package com.osmand;
 
 
 import java.util.ArrayList;
diff --git a/DataExtractionOSM/src/com/anvisics/data/City.java b/DataExtractionOSM/src/com/osmand/data/City.java
similarity index 89%
rename from DataExtractionOSM/src/com/anvisics/data/City.java
rename to DataExtractionOSM/src/com/osmand/data/City.java
index ba9a21c9ad..8d59307a89 100644
--- a/DataExtractionOSM/src/com/anvisics/data/City.java
+++ b/DataExtractionOSM/src/com/osmand/data/City.java
@@ -1,4 +1,4 @@
-package com.anvisics.data;
+package com.osmand.data;
 
 import java.util.Collection;
 import java.util.Map;
@@ -7,8 +7,8 @@ import java.util.TreeMap;
 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
 import org.openstreetmap.osmosis.core.domain.v0_6.Node;
 
-import com.anvisics.NodeUtil;
-import com.anvisics.NodeUtil.LatLon;
+import com.osmand.NodeUtil;
+import com.osmand.NodeUtil.LatLon;
 
 public class City {
 	
diff --git a/DataExtractionOSM/src/com/anvisics/data/DataTileManager.java b/DataExtractionOSM/src/com/osmand/data/DataTileManager.java
similarity index 94%
rename from DataExtractionOSM/src/com/anvisics/data/DataTileManager.java
rename to DataExtractionOSM/src/com/osmand/data/DataTileManager.java
index 35d1111979..0166ed5b61 100644
--- a/DataExtractionOSM/src/com/anvisics/data/DataTileManager.java
+++ b/DataExtractionOSM/src/com/osmand/data/DataTileManager.java
@@ -1,11 +1,11 @@
-package com.anvisics.data;
+package com.osmand.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.anvisics.NodeUtil;
+import com.osmand.NodeUtil;
 
 /**
  * 
diff --git a/DataExtractionOSM/src/com/anvisics/data/Region.java b/DataExtractionOSM/src/com/osmand/data/Region.java
similarity index 90%
rename from DataExtractionOSM/src/com/anvisics/data/Region.java
rename to DataExtractionOSM/src/com/osmand/data/Region.java
index d9f91901d7..9eb23ac691 100644
--- a/DataExtractionOSM/src/com/anvisics/data/Region.java
+++ b/DataExtractionOSM/src/com/osmand/data/Region.java
@@ -1,4 +1,4 @@
-package com.anvisics.data;
+package com.osmand.data;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,9 +9,9 @@ import java.util.Map;
 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
 import org.openstreetmap.osmosis.core.domain.v0_6.Node;
 
-import com.anvisics.NodeUtil;
-import com.anvisics.NodeUtil.LatLon;
-import com.anvisics.data.City.CityType;
+import com.osmand.NodeUtil;
+import com.osmand.NodeUtil.LatLon;
+import com.osmand.data.City.CityType;
 
 public class Region {
 	private Entity entity;
diff --git a/DataExtractionOSM/src/com/anvisics/data/Street.java b/DataExtractionOSM/src/com/osmand/data/Street.java
similarity index 85%
rename from DataExtractionOSM/src/com/anvisics/data/Street.java
rename to DataExtractionOSM/src/com/osmand/data/Street.java
index 5f959c53b6..b9072ea539 100644
--- a/DataExtractionOSM/src/com/anvisics/data/Street.java
+++ b/DataExtractionOSM/src/com/osmand/data/Street.java
@@ -1,4 +1,4 @@
-package com.anvisics.data;
+package com.osmand.data;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,7 +6,7 @@ import java.util.Set;
 
 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
 
-import com.anvisics.NodeUtil.LatLon;
+import com.osmand.NodeUtil.LatLon;
 
 public class Street {