diff --git a/OsmAnd-java/.classpath b/OsmAnd-java/.classpath
index 7b0914ce10..4c695a9d4a 100644
--- a/OsmAnd-java/.classpath
+++ b/OsmAnd-java/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="com/OsMoDroid/" kind="src" path="android"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="libs/bsh-core-2.0b4.jar"/>
diff --git a/OsmAnd-java/.project b/OsmAnd-java/.project
index e601fb5960..60d41e0594 100644
--- a/OsmAnd-java/.project
+++ b/OsmAnd-java/.project
@@ -14,13 +14,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>android</name>
-			<type>2</type>
-			<locationURI>OSMAND_TRUNK/OsmAnd/gen</locationURI>
-		</link>
-	</linkedResources>
 	<variableList>
 		<variable>
 			<name>OSMAND_TRUNK</name>
diff --git a/OsmAnd-java/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/ApplicationMode.java
rename to OsmAnd/src/net/osmand/plus/ApplicationMode.java
diff --git a/OsmAnd-java/src/net/osmand/plus/ClientContext.java b/OsmAnd/src/net/osmand/plus/ClientContext.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/ClientContext.java
rename to OsmAnd/src/net/osmand/plus/ClientContext.java
diff --git a/OsmAnd-java/src/net/osmand/plus/CurrentPositionHelper.java b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/CurrentPositionHelper.java
rename to OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/FavouritesDbHelper.java
rename to OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/GPXUtilities.java
rename to OsmAnd/src/net/osmand/plus/GPXUtilities.java
diff --git a/OsmAnd-java/src/net/osmand/plus/NameFinderPoiFilter.java b/OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/NameFinderPoiFilter.java
rename to OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java
diff --git a/OsmAnd-java/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/OsmAndFormatter.java
rename to OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
diff --git a/OsmAnd-java/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
similarity index 99%
rename from OsmAnd-java/src/net/osmand/plus/OsmandSettings.java
rename to OsmAnd/src/net/osmand/plus/OsmandSettings.java
index b9b1f1cf46..09301df4a9 100644
--- a/OsmAnd-java/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -84,7 +84,7 @@ public class OsmandSettings {
 	private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings"; //$NON-NLS-1$
 	
 	/// Settings variables
-	private final ClientContext ctx;
+	private final OsmandApplication ctx;
 	private SettingsAPI settingsAPI;
 	private Object globalPreferences;
 	private Object defaultProfilePreferences;
@@ -99,7 +99,7 @@ public class OsmandSettings {
 	private List<TileSourceTemplate> internetAvailableSourceTemplates = null;
 	
 	
-	protected OsmandSettings(ClientContext clientContext) {
+	protected OsmandSettings(OsmandApplication clientContext) {
 		ctx = clientContext;
 		settingsAPI = ctx.getSettingsAPI();
 
diff --git a/OsmAnd-java/src/net/osmand/plus/PoiFilter.java b/OsmAnd/src/net/osmand/plus/PoiFilter.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/PoiFilter.java
rename to OsmAnd/src/net/osmand/plus/PoiFilter.java
diff --git a/OsmAnd-java/src/net/osmand/plus/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/PoiFiltersHelper.java
rename to OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/RotatedTileBox.java b/OsmAnd/src/net/osmand/plus/RotatedTileBox.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/RotatedTileBox.java
rename to OsmAnd/src/net/osmand/plus/RotatedTileBox.java
diff --git a/OsmAnd-java/src/net/osmand/plus/SearchByNameFilter.java b/OsmAnd/src/net/osmand/plus/SearchByNameFilter.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/SearchByNameFilter.java
rename to OsmAnd/src/net/osmand/plus/SearchByNameFilter.java
diff --git a/OsmAnd-java/src/net/osmand/plus/SearchHistoryHelper.java b/OsmAnd/src/net/osmand/plus/SearchHistoryHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/SearchHistoryHelper.java
rename to OsmAnd/src/net/osmand/plus/SearchHistoryHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/SpecialPhrases.java b/OsmAnd/src/net/osmand/plus/SpecialPhrases.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/SpecialPhrases.java
rename to OsmAnd/src/net/osmand/plus/SpecialPhrases.java
diff --git a/OsmAnd-java/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/TargetPointsHelper.java
rename to OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/Version.java
rename to OsmAnd/src/net/osmand/plus/Version.java
diff --git a/OsmAnd-java/src/net/osmand/plus/access/AccessibilityMode.java b/OsmAnd/src/net/osmand/plus/access/AccessibilityMode.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/access/AccessibilityMode.java
rename to OsmAnd/src/net/osmand/plus/access/AccessibilityMode.java
diff --git a/OsmAnd-java/src/net/osmand/plus/access/RelativeDirectionStyle.java b/OsmAnd/src/net/osmand/plus/access/RelativeDirectionStyle.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/access/RelativeDirectionStyle.java
rename to OsmAnd/src/net/osmand/plus/access/RelativeDirectionStyle.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/ExternalServiceAPI.java b/OsmAnd/src/net/osmand/plus/api/ExternalServiceAPI.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/ExternalServiceAPI.java
rename to OsmAnd/src/net/osmand/plus/api/ExternalServiceAPI.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/InternalOsmAndAPI.java b/OsmAnd/src/net/osmand/plus/api/InternalOsmAndAPI.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/InternalOsmAndAPI.java
rename to OsmAnd/src/net/osmand/plus/api/InternalOsmAndAPI.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/InternalToDoAPI.java b/OsmAnd/src/net/osmand/plus/api/InternalToDoAPI.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/InternalToDoAPI.java
rename to OsmAnd/src/net/osmand/plus/api/InternalToDoAPI.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/RendererAPI.java b/OsmAnd/src/net/osmand/plus/api/RendererAPI.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/RendererAPI.java
rename to OsmAnd/src/net/osmand/plus/api/RendererAPI.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/SQLiteAPI.java b/OsmAnd/src/net/osmand/plus/api/SQLiteAPI.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/SQLiteAPI.java
rename to OsmAnd/src/net/osmand/plus/api/SQLiteAPI.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/SettingsAPI.java b/OsmAnd/src/net/osmand/plus/api/SettingsAPI.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/SettingsAPI.java
rename to OsmAnd/src/net/osmand/plus/api/SettingsAPI.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/render/Canvas.java b/OsmAnd/src/net/osmand/plus/api/render/Canvas.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/render/Canvas.java
rename to OsmAnd/src/net/osmand/plus/api/render/Canvas.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/render/Color.java b/OsmAnd/src/net/osmand/plus/api/render/Color.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/render/Color.java
rename to OsmAnd/src/net/osmand/plus/api/render/Color.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/render/Paint.java b/OsmAnd/src/net/osmand/plus/api/render/Paint.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/render/Paint.java
rename to OsmAnd/src/net/osmand/plus/api/render/Paint.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/render/Path.java b/OsmAnd/src/net/osmand/plus/api/render/Path.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/render/Path.java
rename to OsmAnd/src/net/osmand/plus/api/render/Path.java
diff --git a/OsmAnd-java/src/net/osmand/plus/api/render/Typeface.java b/OsmAnd/src/net/osmand/plus/api/render/Typeface.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/api/render/Typeface.java
rename to OsmAnd/src/net/osmand/plus/api/render/Typeface.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/DownloadActivityType.java
rename to OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/DownloadEntry.java b/OsmAnd/src/net/osmand/plus/download/DownloadEntry.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/DownloadEntry.java
rename to OsmAnd/src/net/osmand/plus/download/DownloadEntry.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/DownloadFileHelper.java b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/DownloadFileHelper.java
rename to OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java b/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java
rename to OsmAnd/src/net/osmand/plus/download/DownloadTracker.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/IndexFileList.java b/OsmAnd/src/net/osmand/plus/download/IndexFileList.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/IndexFileList.java
rename to OsmAnd/src/net/osmand/plus/download/IndexFileList.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/IndexItem.java b/OsmAnd/src/net/osmand/plus/download/IndexItem.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/IndexItem.java
rename to OsmAnd/src/net/osmand/plus/download/IndexItem.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/IndexItemCategory.java b/OsmAnd/src/net/osmand/plus/download/IndexItemCategory.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/IndexItemCategory.java
rename to OsmAnd/src/net/osmand/plus/download/IndexItemCategory.java
diff --git a/OsmAnd-java/src/net/osmand/plus/download/SrtmIndexItem.java b/OsmAnd/src/net/osmand/plus/download/SrtmIndexItem.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/download/SrtmIndexItem.java
rename to OsmAnd/src/net/osmand/plus/download/SrtmIndexItem.java
diff --git a/OsmAnd-java/src/net/osmand/plus/render/RendererRegistry.java b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/render/RendererRegistry.java
rename to OsmAnd/src/net/osmand/plus/render/RendererRegistry.java
diff --git a/OsmAnd-java/src/net/osmand/plus/render/TextRenderer.java.bak b/OsmAnd/src/net/osmand/plus/render/TextRenderer.java.bak
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/render/TextRenderer.java.bak
rename to OsmAnd/src/net/osmand/plus/render/TextRenderer.java.bak
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/AlarmInfo.java b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/AlarmInfo.java
rename to OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/RouteCalculationParams.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/RouteCalculationParams.java
rename to OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/RouteCalculationResult.java
rename to OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/RouteDirectionInfo.java b/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/RouteDirectionInfo.java
rename to OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/RouteProvider.java
rename to OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/RoutingHelper.java
rename to OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
diff --git a/OsmAnd-java/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/routing/VoiceRouter.java
rename to OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
diff --git a/OsmAnd-java/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
rename to OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
diff --git a/OsmAnd-java/src/net/osmand/plus/voice/CommandBuilder.java b/OsmAnd/src/net/osmand/plus/voice/CommandBuilder.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/voice/CommandBuilder.java
rename to OsmAnd/src/net/osmand/plus/voice/CommandBuilder.java
diff --git a/OsmAnd-java/src/net/osmand/plus/voice/CommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/voice/CommandPlayer.java
rename to OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java
diff --git a/OsmAnd-java/src/net/osmand/plus/voice/CommandPlayerException.java b/OsmAnd/src/net/osmand/plus/voice/CommandPlayerException.java
similarity index 100%
rename from OsmAnd-java/src/net/osmand/plus/voice/CommandPlayerException.java
rename to OsmAnd/src/net/osmand/plus/voice/CommandPlayerException.java