Fix compilation problems for rebranding

DataExtractionOSM/src/net/osmand/Algoritms.java

@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.osmand.LogUtil;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java

@@ -12,7 +12,6 @@ import java.util.List;
 import java.util.Map;
 
 import net.osmand.Algoritms;
-import net.osmand.LogUtil;
 import net.osmand.StringMatcher;
 import net.osmand.binary.BinaryMapAddressReaderAdapter.AddressRegion;
 import net.osmand.binary.BinaryMapTransportReaderAdapter.TransportIndex;
@@ -24,6 +23,7 @@ import net.osmand.osm.LatLon;
 import net.osmand.osm.MapRenderingTypes;
 import net.osmand.osm.MapUtils;
 import net.osmand.osm.MapRenderingTypes.MapRulType;
+import net.osmand.plus.LogUtil;
 import net.sf.junidecode.Junidecode;
 
 import org.apache.commons.logging.Log;

DataExtractionOSM/src/net/osmand/binary/BinaryRouteDataReader.java

@@ -18,13 +18,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
 
-import net.osmand.LogUtil;
 import net.osmand.binary.BinaryMapIndexReader.MapIndex;
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
 import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapRenderingTypes;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java

@@ -12,12 +12,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.LogUtil;
 import net.osmand.data.Building;
 import net.osmand.data.City;
 import net.osmand.data.Street;
 import net.osmand.data.City.CityType;
 import net.osmand.osm.Node;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java

@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import net.osmand.LogUtil;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java

@@ -15,7 +15,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import net.osmand.Base64;
-import net.osmand.LogUtil;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java

@@ -17,8 +17,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import net.osmand.Algoritms;
-import net.osmand.LogUtil;
 import net.osmand.Version;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java

@@ -4,7 +4,7 @@ import java.text.MessageFormat;
 
 import net.osmand.Algoritms;
 import net.osmand.IProgress;
-import net.osmand.LogUtil;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/map/TileSourceManager.java

@@ -10,8 +10,8 @@ import java.util.ArrayList;
 import java.util.regex.Pattern;
 
 import net.osmand.Algoritms;
-import net.osmand.LogUtil;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java

@@ -16,9 +16,9 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import net.osmand.LogUtil;
 import net.osmand.data.AmenityType;
 import net.osmand.osm.OSMSettings.OSMTagKey;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 import org.xml.sax.Attributes;

DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java

@@ -11,8 +11,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import net.osmand.LogUtil;
 import net.osmand.osm.MapRenderingTypes;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 import org.xml.sax.Attributes;

OsmAnd/AndroidManifest.xml

@@ -30,8 +30,8 @@
         <activity android:name=".activities.search.SearchStreet2ByNameActivity"></activity>
         <activity android:name=".activities.search.SearchBuildingByNameActivity"></activity>
 		<activity android:name=".activities.EditPOIFilterActivity"></activity>
-		<service android:process="net.osmand" android:label="@string/process_navigation_service" android:name=".NavigationService">
-			<intent-filter><action android:name="net.osmand.NavigationService"></action></intent-filter>
+		<service android:process="net.osmand.plus" android:label="@string/process_navigation_service" android:name=".NavigationService">
+			<intent-filter><action android:name="net.osmand.plus.NavigationService"></action></intent-filter>
 		</service>
 </application>
 

OsmAnd/res/layout-large/main.xml

@@ -3,8 +3,8 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-<net.osmand.views.OsmandMapTileView android:id="@+id/MapView" android:layout_width="fill_parent" android:layout_height="fill_parent"/>
-<net.osmand.views.OsmZoomControls android:id="@+id/ZoomControls" 
+<net.osmand.plus.views.OsmandMapTileView android:id="@+id/MapView" android:layout_width="fill_parent" android:layout_height="fill_parent"/>
+<net.osmand.plus.views.OsmZoomControls android:id="@+id/ZoomControls" 
 		android:layout_marginRight="8dp" android:layout_marginBottom="6dp" 
 		android:layout_width="120dp" android:layout_height="wrap_content" android:layout_gravity="bottom|right"/>
 

OsmAnd/res/layout/main.xml

@@ -3,11 +3,11 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-<net.osmand.views.OsmandMapTileView android:id="@+id/MapView" android:layout_width="fill_parent" android:layout_height="fill_parent"/>
+<net.osmand.plus.views.OsmandMapTileView android:id="@+id/MapView" android:layout_width="fill_parent" android:layout_height="fill_parent"/>
 <View android:id="@+id/ProgressBar"  
 			android:layout_width="40dp"  android:layout_height="40dp" android:layout_marginRight="25dp" android:layout_marginTop="5dp" android:layout_gravity="top|right"/>  			 
 			
-<net.osmand.views.OsmZoomControls android:id="@+id/ZoomControls"
+<net.osmand.plus.views.OsmZoomControls android:id="@+id/ZoomControls"
 		android:layout_marginRight="3dp" android:layout_marginBottom="2dp"
 		android:layout_width="120dp" android:layout_height="wrap_content" android:layout_gravity="bottom|right"/>
 

OsmAnd/src/net/osmand/plus/AmenityIndexRepository.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.util.List;
 

OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryBinary.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import gnu.trove.list.array.TIntArrayList;
 
@@ -6,8 +6,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-
+import net.osmand.Algoritms;
 import net.osmand.binary.BinaryIndexPart;
 import net.osmand.binary.BinaryMapDataObject;
 import net.osmand.binary.BinaryMapIndexReader;
@@ -23,6 +22,8 @@ import net.osmand.osm.MapRenderingTypes;
 import net.osmand.osm.MapUtils;
 import net.sf.junidecode.Junidecode;
 
+import org.apache.commons.logging.Log;
+
 public class AmenityIndexRepositoryBinary implements AmenityIndexRepository {
 
 	private final static Log log = LogUtil.getLog(AmenityIndexRepositoryBinary.class);

OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryOdb.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,6 +11,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.osmand.Algoritms;
+import net.osmand.IProgress;
 import net.osmand.data.Amenity;
 import net.osmand.data.AmenityType;
 import net.osmand.data.index.IndexConstants;

OsmAnd/src/net/osmand/plus/BaseLocationIndexRepository.java

@@ -1,9 +1,10 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.osmand.IProgress;
 import net.osmand.data.MapObject;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;

OsmAnd/src/net/osmand/plus/BusyIndicator.java

@@ -1,5 +1,6 @@
-package net.osmand;
+package net.osmand.plus;
 
+import net.osmand.plus.R;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;

OsmAnd/src/net/osmand/plus/CollatorStringMatcher.java

@@ -1,7 +1,9 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.text.Collator;
 
+import net.osmand.StringMatcher;
+
 /**
  * Abstract collator matcher that basically supports subclasses with some collator
  * matching.

OsmAnd/src/net/osmand/plus/ContainsStringMatcher.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.text.Collator;
 

OsmAnd/src/net/osmand/plus/DownloadOsmandIndexesHelper.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.IOException;
 import java.net.URL;
@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import net.osmand.data.index.IndexConstants;
+import net.osmand.plus.R;
 
 import org.apache.commons.logging.Log;
 import org.xmlpull.v1.XmlPullParser;

OsmAnd/src/net/osmand/plus/FavouritePoint.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 public class FavouritePoint {
 	private String name;
 	private double latitude;

OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;

OsmAnd/src/net/osmand/plus/GPXUtilities.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,6 +11,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 
+import net.osmand.Version;
+import net.osmand.plus.R;
+
 import org.apache.commons.logging.Log;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;

OsmAnd/src/net/osmand/plus/LogUtil.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -7,10 +7,11 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.activities.OsmandApplication;
+import net.osmand.Messages;
 import net.osmand.data.Amenity;
 import net.osmand.data.AmenityType;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.activities.OsmandApplication;
 import net.sf.junidecode.Junidecode;
 
 import org.apache.commons.logging.Log;

OsmAnd/src/net/osmand/plus/NavigationService.java

@@ -1,9 +1,11 @@
-package net.osmand;
+package net.osmand.plus;
 
 
-import net.osmand.activities.OsmandApplication;
-import net.osmand.activities.RoutingHelper;
-import net.osmand.activities.SavingTrackHelper;
+import net.osmand.Version;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.OsmandApplication;
+import net.osmand.plus.activities.RoutingHelper;
+import net.osmand.plus.activities.SavingTrackHelper;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -8,14 +8,14 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.regex.Pattern;
 
-
-import net.osmand.activities.OsmandApplication;
-import net.osmand.activities.RouteProvider.RouteService;
-import net.osmand.activities.search.SearchHistoryHelper;
 import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.osm.LatLon;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.OsmandApplication;
+import net.osmand.plus.activities.RouteProvider.RouteService;
+import net.osmand.plus.activities.search.SearchHistoryHelper;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;

OsmAnd/src/net/osmand/plus/PoiFilter.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -7,11 +7,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.osmand.activities.OsmandApplication;
+import net.osmand.Messages;
 import net.osmand.data.Amenity;
 import net.osmand.data.AmenityType;
 import net.osmand.data.index.IndexConstants;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.activities.OsmandApplication;
 
 public class PoiFilter {
 	

OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,8 +7,9 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.activities.OsmandApplication;
+import net.osmand.Messages;
 import net.osmand.data.AmenityType;
+import net.osmand.plus.activities.OsmandApplication;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

OsmAnd/src/net/osmand/plus/ProgressDialogImplementation.java

@@ -1,5 +1,7 @@
-package net.osmand;
+package net.osmand.plus;
 
+import net.osmand.IProgress;
+import net.osmand.plus.R;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;

OsmAnd/src/net/osmand/plus/RegionAddressRepository.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.text.Collator;
 import java.util.Comparator;

OsmAnd/src/net/osmand/plus/RegionAddressRepositoryBinary.java

@@ -1,14 +1,13 @@
-package net.osmand;
+package net.osmand.plus;
 
-import static net.osmand.CollatorStringMatcher.ccontains;
-import static net.osmand.CollatorStringMatcher.cstartsWith;
+import static net.osmand.plus.CollatorStringMatcher.ccontains;
+import static net.osmand.plus.CollatorStringMatcher.cstartsWith;
 
 import java.io.IOException;
 import java.text.Collator;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 

OsmAnd/src/net/osmand/plus/RegionAddressRepositoryOdb.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.text.Collator;
@@ -14,6 +14,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import net.osmand.Algoritms;
+import net.osmand.IProgress;
 import net.osmand.data.Building;
 import net.osmand.data.City;
 import net.osmand.data.MapObject;

OsmAnd/src/net/osmand/plus/ResourceManager.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +14,8 @@ import java.util.Map;
 import java.util.Stack;
 import java.util.TreeMap;
 
-import net.osmand.activities.OsmandApplication;
+import net.osmand.IProgress;
+import net.osmand.Messages;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.data.Amenity;
 import net.osmand.data.TransportStop;
@@ -25,10 +26,11 @@ import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
 import net.osmand.map.ITileSource;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
-import net.osmand.render.BaseOsmandRender;
-import net.osmand.render.MapRenderRepositories;
-import net.osmand.render.RendererRegistry;
-import net.osmand.views.POIMapLayer;
+import net.osmand.plus.activities.OsmandApplication;
+import net.osmand.plus.render.BaseOsmandRender;
+import net.osmand.plus.render.MapRenderRepositories;
+import net.osmand.plus.render.RendererRegistry;
+import net.osmand.plus.views.POIMapLayer;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/RotatedTileBox.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 import net.osmand.osm.MapUtils;
 import android.graphics.PointF;
 import android.graphics.RectF;

OsmAnd/src/net/osmand/plus/SQLiteTileSource.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.text.MessageFormat;
 
+import net.osmand.Algoritms;
 import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;

OsmAnd/src/net/osmand/plus/TransportIndexRepository.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.util.List;
 

OsmAnd/src/net/osmand/plus/TransportIndexRepositoryBinary.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.IOException;
 import java.text.MessageFormat;

OsmAnd/src/net/osmand/plus/TransportIndexRepositoryOdb.java

@@ -1,4 +1,4 @@
-package net.osmand;
+package net.osmand.plus;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -9,6 +9,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.osmand.IProgress;
 import net.osmand.data.TransportRoute;
 import net.osmand.data.TransportStop;
 import net.osmand.data.index.IndexConstants;

OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java

@@ -1,13 +1,13 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.OsmandSettings.DayNightMode;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.DayNightMode;
 import net.osmand.SunriseSunset;
 
 import org.apache.commons.logging.Log;

OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java

@@ -1,7 +1,6 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import static net.osmand.data.index.IndexConstants.ADDRESS_INDEX_EXT;
-import static net.osmand.DownloadOsmandIndexesHelper.IndexItem;
 import static net.osmand.data.index.IndexConstants.ADDRESS_INDEX_EXT_ZIP;
 import static net.osmand.data.index.IndexConstants.ADDRESS_TABLE_VERSION;
 import static net.osmand.data.index.IndexConstants.BINARY_MAP_INDEX_EXT;
@@ -15,6 +14,7 @@ import static net.osmand.data.index.IndexConstants.TRANSPORT_INDEX_EXT_ZIP;
 import static net.osmand.data.index.IndexConstants.TRANSPORT_TABLE_VERSION;
 import static net.osmand.data.index.IndexConstants.VOICE_INDEX_EXT_ZIP;
 import static net.osmand.data.index.IndexConstants.VOICE_VERSION;
+import static net.osmand.plus.DownloadOsmandIndexesHelper.IndexItem;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -40,12 +40,12 @@ import java.util.Map.Entry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import net.osmand.DownloadOsmandIndexesHelper;
 import net.osmand.IProgress;
-import net.osmand.LogUtil;
-import net.osmand.ProgressDialogImplementation;
-import net.osmand.R;
-import net.osmand.ResourceManager;
+import net.osmand.plus.DownloadOsmandIndexesHelper;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.ProgressDialogImplementation;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
 import net.osmand.data.index.DownloaderIndexFromGoogleCode;
 import net.osmand.data.index.IndexConstants;
 
@@ -743,7 +743,7 @@ public class DownloadIndexActivity extends ListActivity {
 		private final Map<String, IndexItem> indexFiles;
 
 		public DownloadIndexAdapter(Map<String, IndexItem> indexFiles) {
-			super(DownloadIndexActivity.this, net.osmand.R.layout.download_index_list_item);
+			super(DownloadIndexActivity.this, net.osmand.plus.R.layout.download_index_list_item);
 			this.indexFiles = new LinkedHashMap<String, IndexItem>(indexFiles);
 			for (Entry<String, IndexItem> entry : indexFiles.entrySet()) {
 				add(entry.getValue());
@@ -759,7 +759,7 @@ public class DownloadIndexActivity extends ListActivity {
 			View v = convertView;
 			if (v == null) {
 				LayoutInflater inflater = getLayoutInflater();
-				v = inflater.inflate(net.osmand.R.layout.download_index_list_item, parent, false);
+				v = inflater.inflate(net.osmand.plus.R.layout.download_index_list_item, parent, false);
 			}
 			final View row = v; 
 			TextView item = (TextView) row.findViewById(R.id.download_item);

OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java

@@ -1,17 +1,17 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
 
-import net.osmand.LogUtil;
-import net.osmand.R;
-import net.osmand.ResourceManager;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.data.preparation.MapTileDownloader;
 import net.osmand.data.preparation.MapTileDownloader.DownloadRequest;
 import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
 import net.osmand.map.ITileSource;
 import net.osmand.osm.MapUtils;
-import net.osmand.views.OsmandMapTileView;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java

@@ -1,17 +1,17 @@
 /**
  * 
  */
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.text.MessageFormat;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import net.osmand.OsmandSettings;
-import net.osmand.PoiFilter;
-import net.osmand.PoiFiltersHelper;
-import net.osmand.R;
-import net.osmand.activities.search.SearchPOIActivity;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFilter;
+import net.osmand.plus.PoiFiltersHelper;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.search.SearchPOIActivity;
 import net.osmand.data.AmenityType;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapRenderingTypes;

OsmAnd/src/net/osmand/plus/activities/EditingPOIActivity.java

@@ -1,4 +1,4 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -19,12 +19,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.osmand.AmenityIndexRepository;
-import net.osmand.AmenityIndexRepositoryOdb;
 import net.osmand.Base64;
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
+import net.osmand.plus.AmenityIndexRepository;
+import net.osmand.plus.AmenityIndexRepositoryOdb;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.Version;
 import net.osmand.data.Amenity;
 import net.osmand.data.AmenityType;
@@ -40,7 +41,6 @@ import net.osmand.osm.OSMSettings.OSMTagKey;
 import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule;
 import net.osmand.osm.OpeningHoursParser.OpeningHoursRule;
 import net.osmand.osm.io.OsmBaseStorage;
-import net.osmand.views.OsmandMapTileView;
 
 import org.apache.commons.logging.Log;
 import org.apache.http.HttpResponse;

OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -11,14 +11,14 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import net.osmand.FavouritePoint;
-import net.osmand.FavouritesDbHelper;
-import net.osmand.GPXUtilities;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.ResourceManager;
-import net.osmand.GPXUtilities.GPXFileResult;
-import net.osmand.GPXUtilities.WptPt;
+import net.osmand.plus.FavouritePoint;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.GPXUtilities.GPXFileResult;
+import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
 import android.app.AlertDialog;

OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java

@@ -1,12 +1,12 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.File;
 import java.text.MessageFormat;
 
-import net.osmand.R;
-import net.osmand.ResourceManager;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.Version;
-import net.osmand.activities.search.SearchActivity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -1,4 +1,4 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -12,26 +12,43 @@ import java.util.List;
 import java.util.Map;
 
 import net.osmand.Algoritms;
-import net.osmand.AmenityIndexRepository;
-import net.osmand.AmenityIndexRepositoryOdb;
-import net.osmand.BusyIndicator;
-import net.osmand.FavouritePoint;
-import net.osmand.FavouritesDbHelper;
-import net.osmand.GPXUtilities;
-import net.osmand.GPXUtilities.GPXFileResult;
-import net.osmand.GPXUtilities.WptPt;
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.OsmandSettings.ApplicationMode;
-import net.osmand.PoiFilter;
-import net.osmand.PoiFiltersHelper;
-import net.osmand.R;
-import net.osmand.ResourceManager;
-import net.osmand.SQLiteTileSource;
+import net.osmand.plus.AmenityIndexRepository;
+import net.osmand.plus.AmenityIndexRepositoryOdb;
+import net.osmand.plus.BusyIndicator;
+import net.osmand.plus.FavouritePoint;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFilter;
+import net.osmand.plus.PoiFiltersHelper;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.SQLiteTileSource;
+import net.osmand.plus.GPXUtilities.GPXFileResult;
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.OsmandSettings.ApplicationMode;
+import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.activities.search.SearchPoiFilterActivity;
+import net.osmand.plus.activities.search.SearchTransportActivity;
+import net.osmand.plus.render.MapRenderRepositories;
+import net.osmand.plus.render.RendererLayer;
+import net.osmand.plus.views.AnimateDraggingMapThread;
+import net.osmand.plus.views.ContextMenuLayer;
+import net.osmand.plus.views.FavoritesLayer;
+import net.osmand.plus.views.GPXLayer;
+import net.osmand.plus.views.MapInfoLayer;
+import net.osmand.plus.views.OsmBugsLayer;
+import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.plus.views.POIMapLayer;
+import net.osmand.plus.views.PointLocationLayer;
+import net.osmand.plus.views.PointNavigationLayer;
+import net.osmand.plus.views.RouteInfoLayer;
+import net.osmand.plus.views.RouteLayer;
+import net.osmand.plus.views.TransportInfoLayer;
+import net.osmand.plus.views.TransportStopsLayer;
+import net.osmand.plus.views.YandexTrafficLayer;
 import net.osmand.Version;
-import net.osmand.activities.search.SearchActivity;
-import net.osmand.activities.search.SearchPoiFilterActivity;
-import net.osmand.activities.search.SearchTransportActivity;
 import net.osmand.data.Amenity;
 import net.osmand.data.AmenityType;
 import net.osmand.data.preparation.MapTileDownloader;
@@ -41,23 +58,6 @@ import net.osmand.map.IMapLocationListener;
 import net.osmand.map.ITileSource;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
-import net.osmand.render.MapRenderRepositories;
-import net.osmand.render.RendererLayer;
-import net.osmand.views.AnimateDraggingMapThread;
-import net.osmand.views.ContextMenuLayer;
-import net.osmand.views.FavoritesLayer;
-import net.osmand.views.GPXLayer;
-import net.osmand.views.MapInfoLayer;
-import net.osmand.views.OsmBugsLayer;
-import net.osmand.views.OsmandMapTileView;
-import net.osmand.views.POIMapLayer;
-import net.osmand.views.PointLocationLayer;
-import net.osmand.views.PointNavigationLayer;
-import net.osmand.views.RouteInfoLayer;
-import net.osmand.views.RouteLayer;
-import net.osmand.views.TransportInfoLayer;
-import net.osmand.views.TransportStopsLayer;
-import net.osmand.views.YandexTrafficLayer;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -1430,7 +1430,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
 								});
 							} else {
 								OsmandSettings.setShowingFavorites(MapActivity.this, true);
-								List<net.osmand.FavouritePoint> pts = new ArrayList<FavouritePoint>();
+								List<net.osmand.plus.FavouritePoint> pts = new ArrayList<FavouritePoint>();
 								for(WptPt p : res.wayPoints){
 									FavouritePoint pt = new FavouritePoint();
 									pt.setLatitude(p.lat);

OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java

@@ -1,16 +1,16 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.MessageFormat;
 import java.util.Locale;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
-import net.osmand.views.OsmandMapTileView;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;

OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java

@@ -1,11 +1,11 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import net.osmand.R;
+import net.osmand.plus.R;
 import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule;
 import net.osmand.osm.OpeningHoursParser.OpeningHoursRule;
 import android.app.AlertDialog;

OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java

@@ -1,4 +1,4 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
@@ -9,14 +9,14 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.List;
 
 import net.osmand.Algoritms;
-import net.osmand.FavouritesDbHelper;
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.PoiFiltersHelper;
-import net.osmand.ProgressDialogImplementation;
-import net.osmand.R;
-import net.osmand.ResourceManager;
-import net.osmand.voice.CommandPlayer;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFiltersHelper;
+import net.osmand.plus.ProgressDialogImplementation;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.voice.CommandPlayer;
 import android.app.AlertDialog;
 import android.app.Application;
 import android.app.ProgressDialog;

OsmAnd/src/net/osmand/plus/activities/RouteProvider.java

@@ -1,4 +1,4 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -15,11 +15,12 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 
-import net.osmand.LogUtil;
-import net.osmand.R;
-import net.osmand.OsmandSettings.ApplicationMode;
-import net.osmand.activities.RoutingHelper.RouteDirectionInfo;
-import net.osmand.activities.RoutingHelper.TurnType;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.R;
+import net.osmand.plus.OsmandSettings.ApplicationMode;
+import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo;
+import net.osmand.plus.activities.RoutingHelper.TurnType;
+import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryRouteDataReader;
 import net.osmand.binary.BinaryRouteDataReader.RouteSegment;
@@ -27,7 +28,6 @@ import net.osmand.binary.BinaryRouteDataReader.RouteSegmentResult;
 import net.osmand.binary.BinaryRouteDataReader.RoutingContext;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
-import net.osmand.render.MapRenderRepositories;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

OsmAnd/src/net/osmand/plus/activities/RoutingHelper.java

@@ -1,18 +1,18 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.OsmandSettings.ApplicationMode;
-import net.osmand.activities.RouteProvider.RouteCalculationResult;
-import net.osmand.activities.RouteProvider.RouteService;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.OsmandSettings.ApplicationMode;
+import net.osmand.plus.activities.RouteProvider.RouteCalculationResult;
+import net.osmand.plus.activities.RouteProvider.RouteService;
+import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
-import net.osmand.voice.CommandPlayer;
 import android.app.Activity;
 import android.content.Context;
 import android.location.Location;

OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java

@@ -1,4 +1,4 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -6,11 +6,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.GPXUtilities;
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.ResourceManager;
-import net.osmand.GPXUtilities.TrkPt;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.GPXUtilities.TrkPt;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java

@@ -1,4 +1,4 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.io.File;
 import java.util.Arrays;
@@ -10,20 +10,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.osmand.NavigationService;
-import net.osmand.OsmandSettings;
-import net.osmand.OsmandSettings.ApplicationMode;
-import net.osmand.OsmandSettings.DayNightMode;
-import net.osmand.PoiFiltersHelper;
-import net.osmand.ProgressDialogImplementation;
-import net.osmand.R;
-import net.osmand.ResourceManager;
-import net.osmand.SQLiteTileSource;
-import net.osmand.activities.RouteProvider.RouteService;
+import net.osmand.plus.NavigationService;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFiltersHelper;
+import net.osmand.plus.ProgressDialogImplementation;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.SQLiteTileSource;
+import net.osmand.plus.OsmandSettings.ApplicationMode;
+import net.osmand.plus.OsmandSettings.DayNightMode;
+import net.osmand.plus.activities.RouteProvider.RouteService;
+import net.osmand.plus.render.BaseOsmandRender;
+import net.osmand.plus.render.RendererRegistry;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
-import net.osmand.render.BaseOsmandRender;
-import net.osmand.render.RendererRegistry;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;

OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java

@@ -1,17 +1,17 @@
 /**
  * 
  */
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.text.MessageFormat;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.activities.RoutingHelper.RouteDirectionInfo;
-import net.osmand.activities.RoutingHelper.TurnType;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo;
+import net.osmand.plus.activities.RoutingHelper.TurnType;
+import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.osm.MapUtils;
-import net.osmand.views.MapInfoLayer;
 import android.app.ListActivity;
 import android.content.Intent;
 import android.graphics.Canvas;

OsmAnd/src/net/osmand/plus/activities/TransportRouteHelper.java

@@ -1,9 +1,9 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.TransportIndexRepository.RouteInfoLocation;
+import net.osmand.plus.TransportIndexRepository.RouteInfoLocation;
 
 
 public class TransportRouteHelper {

OsmAnd/src/net/osmand/plus/activities/VoiceRouter.java

@@ -1,10 +1,10 @@
-package net.osmand.activities;
+package net.osmand.plus.activities;
 
-import net.osmand.OsmandSettings.ApplicationMode;
-import net.osmand.activities.RoutingHelper.RouteDirectionInfo;
-import net.osmand.activities.RoutingHelper.TurnType;
-import net.osmand.voice.CommandPlayer;
-import net.osmand.voice.CommandPlayer.CommandBuilder;
+import net.osmand.plus.OsmandSettings.ApplicationMode;
+import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo;
+import net.osmand.plus.activities.RoutingHelper.TurnType;
+import net.osmand.plus.voice.CommandPlayer;
+import net.osmand.plus.voice.CommandPlayer.CommandBuilder;
 
 
 public class VoiceRouter {

OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java

@@ -1,10 +1,10 @@
 /**
  * 
  */
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
-import net.osmand.R;
-import net.osmand.activities.NavigatePointActivity;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.NavigatePointActivity;
 import android.app.TabActivity;
 import android.content.Intent;
 import android.os.Bundle;

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressActivity.java

@@ -1,13 +1,13 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 
 import java.text.MessageFormat;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RegionAddressRepository;
-import net.osmand.activities.MapActivity;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RegionAddressRepository;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.data.Building;
 import net.osmand.data.City;
 import net.osmand.data.MapObject;

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineActivity.java

@@ -1,4 +1,4 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -9,11 +9,11 @@ import java.util.List;
 import java.util.Locale;
 
 import net.osmand.Algoritms;
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.Version;
-import net.osmand.activities.MapActivity;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
 

OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java

@@ -1,12 +1,12 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RegionAddressRepository;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RegionAddressRepository;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.data.Building;
 import net.osmand.data.City;
 import net.osmand.data.PostCode;

OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java

@@ -1,8 +1,8 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.List;
 
-import net.osmand.R;
+import net.osmand.plus.R;
 import android.app.ListActivity;
 import android.os.Bundle;
 import android.os.Handler;

OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java

@@ -1,12 +1,12 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RegionAddressRepository;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RegionAddressRepository;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.data.City;
 import net.osmand.data.MapObject;
 import net.osmand.data.PostCode;

OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryActivity.java

@@ -1,11 +1,11 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.activities.MapActivity;
-import net.osmand.activities.search.SearchHistoryHelper.HistoryEntry;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.search.SearchHistoryHelper.HistoryEntry;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
 import android.app.AlertDialog;

OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryHelper.java

@@ -1,4 +1,4 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;

OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -9,13 +9,13 @@ import java.util.Collection;
 import java.util.List;
 
 import net.osmand.Algoritms;
-import net.osmand.LogUtil;
-import net.osmand.NameFinderPoiFilter;
-import net.osmand.OsmandSettings;
-import net.osmand.PoiFilter;
-import net.osmand.R;
-import net.osmand.activities.MapActivity;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.NameFinderPoiFilter;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFilter;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.data.Amenity;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;

OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java

@@ -1,17 +1,17 @@
 /**
  * 
  */
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.PoiFilter;
-import net.osmand.PoiFiltersHelper;
-import net.osmand.R;
-import net.osmand.activities.EditPOIFilterActivity;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFilter;
+import net.osmand.plus.PoiFiltersHelper;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.EditPOIFilterActivity;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.osm.LatLon;
 import android.app.AlertDialog;
 import android.app.ListActivity;

OsmAnd/src/net/osmand/plus/activities/search/SearchRegionByNameActivity.java

@@ -1,12 +1,12 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RegionAddressRepository;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RegionAddressRepository;
+import net.osmand.plus.activities.OsmandApplication;
 import android.os.Bundle;
 import android.widget.TextView;
 import android.widget.Toast;

OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java

@@ -1,12 +1,12 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RegionAddressRepository;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RegionAddressRepository;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.data.City;
 import net.osmand.data.PostCode;
 import net.osmand.data.Street;

OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java

@@ -1,12 +1,12 @@
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RegionAddressRepository;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RegionAddressRepository;
+import net.osmand.plus.activities.OsmandApplication;
 import net.osmand.data.City;
 import net.osmand.data.PostCode;
 import net.osmand.data.Street;

OsmAnd/src/net/osmand/plus/activities/search/SearchTransportActivity.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.osmand.activities.search;
+package net.osmand.plus.activities.search;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -9,12 +9,12 @@ import java.util.List;
 
 import net.osmand.Algoritms;
 import net.osmand.Messages;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.TransportIndexRepository;
-import net.osmand.TransportIndexRepository.RouteInfoLocation;
-import net.osmand.activities.OsmandApplication;
-import net.osmand.activities.TransportRouteHelper;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.TransportIndexRepository;
+import net.osmand.plus.TransportIndexRepository.RouteInfoLocation;
+import net.osmand.plus.activities.OsmandApplication;
+import net.osmand.plus.activities.TransportRouteHelper;
 import net.osmand.data.TransportRoute;
 import net.osmand.data.TransportStop;
 import net.osmand.osm.LatLon;

OsmAnd/src/net/osmand/plus/render/BaseOsmandRender.java

@@ -1,4 +1,4 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -7,9 +7,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.LogUtil;
-import net.osmand.render.OsmandRenderer.RenderingContext;
-import net.osmand.render.OsmandRenderer.RenderingPaintProperties;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.render.OsmandRenderer.RenderingContext;
+import net.osmand.plus.render.OsmandRenderer.RenderingPaintProperties;
+import net.osmand.render.OsmandRenderingRulesParser;
 import net.osmand.render.OsmandRenderingRulesParser.EffectAttributes;
 import net.osmand.render.OsmandRenderingRulesParser.FilterState;
 import net.osmand.render.OsmandRenderingRulesParser.RenderingRuleVisitor;

OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java

@@ -1,4 +1,4 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.map.TIntByteMap;
@@ -20,11 +20,12 @@ import java.util.Map;
 import java.util.Set;
 
 import net.osmand.IProgress;
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.RotatedTileBox;
-import net.osmand.activities.OsmandApplication;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.RotatedTileBox;
+import net.osmand.plus.activities.OsmandApplication;
+import net.osmand.plus.render.OsmandRenderer.RenderingContext;
 import net.osmand.binary.BinaryMapDataObject;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
@@ -34,7 +35,6 @@ import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
 import net.osmand.osm.MapRenderingTypes;
 import net.osmand.osm.MapUtils;
 import net.osmand.osm.MultyPolygon;
-import net.osmand.render.OsmandRenderer.RenderingContext;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java

@@ -1,4 +1,4 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.map.hash.TFloatObjectHashMap;
@@ -11,12 +11,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.LogUtil;
 import net.osmand.binary.BinaryMapDataObject;
 import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
 import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
 import net.osmand.osm.MapRenderingTypes;
 import net.osmand.osm.MultyPolygon;
+import net.osmand.plus.LogUtil;
 import net.sf.junidecode.Junidecode;
 
 import org.apache.commons.logging.Log;

OsmAnd/src/net/osmand/plus/render/PerformanceFlags.java

@@ -1,4 +1,4 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
 public class PerformanceFlags {
 

OsmAnd/src/net/osmand/plus/render/RendererLayer.java

@@ -1,10 +1,10 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
-import net.osmand.ResourceManager;
-import net.osmand.RotatedTileBox;
 import net.osmand.osm.MapUtils;
-import net.osmand.views.OsmandMapLayer;
-import net.osmand.views.OsmandMapTileView;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.RotatedTileBox;
+import net.osmand.plus.views.OsmandMapLayer;
+import net.osmand.plus.views.OsmandMapTileView;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;

OsmAnd/src/net/osmand/plus/render/RendererRegistry.java

@@ -1,4 +1,4 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,7 +12,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.osmand.LogUtil;
+import net.osmand.plus.LogUtil;
+import net.osmand.render.OsmandRenderingRulesParser;
 
 import org.apache.commons.logging.Log;
 import org.xml.sax.SAXException;

OsmAnd/src/net/osmand/plus/render/RenderingIcons.java

@@ -1,9 +1,9 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import net.osmand.R;
+import net.osmand.plus.R;
 
 public class RenderingIcons {
 	

OsmAnd/src/net/osmand/plus/render/UnscaledBitmapLoader.java

@@ -1,4 +1,4 @@
-package net.osmand.render;
+package net.osmand.plus.render;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;

OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java

@@ -1,7 +1,7 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
-import net.osmand.LogUtil;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java

@@ -1,11 +1,11 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.R;
-import net.osmand.activities.MapActivity;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.osm.LatLon;
 import android.content.Context;
 import android.content.DialogInterface;

OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java

@@ -1,10 +1,10 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.List;
 
-import net.osmand.FavouritePoint;
-import net.osmand.FavouritesDbHelper;
-import net.osmand.R;
+import net.osmand.plus.FavouritePoint;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.R;
 import net.osmand.osm.LatLon;
 import android.content.Context;
 import android.content.DialogInterface.OnClickListener;

OsmAnd/src/net/osmand/plus/views/GPXLayer.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.ArrayList;
 import java.util.List;

OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java

@@ -1,12 +1,12 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import net.osmand.Algoritms;
 import net.osmand.Messages;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.activities.MapActivity;
-import net.osmand.activities.RoutingHelper.RouteDirectionInfo;
-import net.osmand.activities.RoutingHelper.TurnType;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo;
+import net.osmand.plus.activities.RoutingHelper.TurnType;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
 import android.content.Context;

OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java

@@ -1,8 +1,8 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.lang.reflect.Method;
 
-import net.osmand.LogUtil;
+import net.osmand.plus.LogUtil;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -11,9 +11,9 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
 import net.osmand.osm.LatLon;
 
 import org.apache.commons.logging.Log;

OsmAnd/src/net/osmand/plus/views/OsmZoomControls.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import android.content.Context;
 import android.util.AttributeSet;

OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import android.graphics.Canvas;
 import android.graphics.PointF;

OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 
 import java.util.ArrayList;
@@ -6,10 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.ResourceManager;
-import net.osmand.activities.OsmandApplication;
 import net.osmand.data.preparation.MapTileDownloader;
 import net.osmand.data.preparation.MapTileDownloader.DownloadRequest;
 import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback;
@@ -17,8 +13,12 @@ import net.osmand.map.IMapLocationListener;
 import net.osmand.map.ITileSource;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
-import net.osmand.views.AnimateDraggingMapThread.AnimateDraggingCallback;
-import net.osmand.views.MultiTouchSupport.MultiTouchZoomListener;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.activities.OsmandApplication;
+import net.osmand.plus.views.AnimateDraggingMapThread.AnimateDraggingCallback;
+import net.osmand.plus.views.MultiTouchSupport.MultiTouchZoomListener;
 
 import org.apache.commons.logging.Log;
 

OsmAnd/src/net/osmand/plus/views/POIMapLayer.java

@@ -1,14 +1,14 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.PoiFilter;
-import net.osmand.R;
-import net.osmand.ResourceManager;
-import net.osmand.activities.EditingPOIActivity;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.PoiFilter;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.activities.EditingPOIActivity;
 import net.osmand.data.Amenity;
 import net.osmand.osm.LatLon;
 import android.content.Context;

OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java

@@ -1,7 +1,7 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
-import net.osmand.OsmandSettings.ApplicationMode;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.OsmandSettings.ApplicationMode;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;

OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import net.osmand.osm.LatLon;
 import android.content.Context;

OsmAnd/src/net/osmand/plus/views/RouteInfoLayer.java

@@ -1,12 +1,12 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.List;
 
-import net.osmand.R;
-import net.osmand.activities.RoutingHelper;
-import net.osmand.activities.ShowRouteInfoActivity;
-import net.osmand.activities.RoutingHelper.IRouteInformationListener;
-import net.osmand.activities.RoutingHelper.RouteDirectionInfo;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.RoutingHelper;
+import net.osmand.plus.activities.ShowRouteInfoActivity;
+import net.osmand.plus.activities.RoutingHelper.IRouteInformationListener;
+import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;

OsmAnd/src/net/osmand/plus/views/RouteLayer.java

@@ -1,11 +1,11 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.LogUtil;
-import net.osmand.activities.RoutingHelper;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.activities.RoutingHelper;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;

OsmAnd/src/net/osmand/plus/views/TransportInfoLayer.java

@@ -1,13 +1,13 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.TransportIndexRepository.RouteInfoLocation;
-import net.osmand.activities.TransportRouteHelper;
 import net.osmand.data.TransportRoute;
 import net.osmand.data.TransportStop;
 import net.osmand.osm.LatLon;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.TransportIndexRepository.RouteInfoLocation;
+import net.osmand.plus.activities.TransportRouteHelper;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;

OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java

@@ -1,11 +1,11 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.TransportIndexRepository;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.TransportIndexRepository;
 import net.osmand.data.TransportStop;
 import net.osmand.osm.LatLon;
 import android.content.Context;

OsmAnd/src/net/osmand/plus/views/YandexTrafficLayer.java

@@ -1,4 +1,4 @@
-package net.osmand.views;
+package net.osmand.plus.views;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -12,8 +12,8 @@ import java.util.Map;
 import java.util.Set;
 
 import net.osmand.Algoritms;
-import net.osmand.LogUtil;
-import net.osmand.R;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.R;
 import net.osmand.osm.MapUtils;
 
 import org.apache.commons.logging.Log;

OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java

@@ -1,4 +1,4 @@
-package net.osmand.voice;
+package net.osmand.plus.voice;
 
 
 import java.io.File;
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import net.osmand.LogUtil;
-import net.osmand.OsmandSettings;
-import net.osmand.R;
-import net.osmand.ResourceManager;
+import net.osmand.plus.LogUtil;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
 import net.osmand.data.index.IndexConstants;
 
 import org.apache.commons.logging.Log;