diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
index 3bffb9f7b3..88a100b43f 100644
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@@ -10,6 +10,7 @@ libs/org.*.jar
 libs/commons-logging-commons-logging-api-1.1.jar
 libs/fr.univ-valenciennes-bzip2-1.0.jar
 libs/it.unibo.alice.tuprolog-tuprolog-3.2.1.jar
+libs/commons-codec-commons-codec-1.11.jar
 
 valgrind/
 bin/
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index e7a96711c7..eeff63d664 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -22,10 +22,18 @@ apply plugin: 'com.github.ksoichiro.eclipse.aar'
 def analytics = (!System.getenv("APP_FEATURES") || System.getenv("APP_FEATURES").contains("+play_market")) &&
 		getGradle().getStartParameter().getTaskRequests().toString().contains("Free")
 
+
 eclipseAar {
     // See "Configurations" for details
     androidTarget = 'android-27'
     aarDependenciesDir = 'aarDependencies'
+    targetConfigurations = ['compile']
+
+//    cleanLibsDirectoryEnabled = true
+}
+
+task printc {
+	configurations.each { if(it.isCanBeResolved())  println it.name }
 }
 
 android {
@@ -390,47 +398,47 @@ repositories {
 
 project.logger.warn("Analytics enabled for free version: $analytics")
 dependencies {
-	compile project(path: ':OsmAnd-java', configuration: 'android')
+	implementation project(path: ':OsmAnd-java', configuration: 'android')
 	if (analytics) {
-		compile 'com.google.firebase:firebase-core:12.0.1'
-		compile 'com.google.firebase:firebase-messaging:12.0.1'
-		compile 'com.google.firebase:firebase-iid:12.0.1'
-		compile 'com.google.firebase:firebase-config:12.0.1'
-		compile 'com.facebook.android:facebook-android-sdk:4.31.0'	
+		implementation 'com.google.firebase:firebase-core:12.0.1'
+		implementation 'com.google.firebase:firebase-messaging:12.0.1'
+		implementation 'com.google.firebase:firebase-iid:12.0.1'
+		implementation 'com.google.firebase:firebase-config:12.0.1'
+		implementation 'com.facebook.android:facebook-android-sdk:4.31.0'	
 	}
-	compile 'com.android.support:multidex:1.0.1'
-	compile 'com.android.support:gridlayout-v7:27.1.0'
-	compile 'com.android.support:cardview-v7:27.1.0'
-	compile 'com.android.support:appcompat-v7:27.1.0'
-	compile 'com.android.support:design:27.1.0'
-	compile 'com.android.support:customtabs:27.1.0'
-	compile fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
+	implementation 'com.android.support:multidex:1.0.1'
+	implementation 'com.android.support:gridlayout-v7:27.1.0'
+	implementation 'com.android.support:cardview-v7:27.1.0'
+	implementation 'com.android.support:appcompat-v7:27.1.0'
+	implementation 'com.android.support:design:27.1.0'
+	implementation 'com.android.support:customtabs:27.1.0'
+	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
-	compile 'commons-logging:commons-logging-api:1.1'
-	compile 'commons-codec:commons-codec:1.11'
-    compile 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
-    compile 'org.beanshell:bsh-core:2.0b4'
-    compile 'fr.univ-valenciennes:bzip2:1.0'
-    compile 'com.moparisthebest:junidecode:0.1.1'
-    compile 'org.immutables:gson:2.5.0'
-    compile 'com.vividsolutions:jts-core:1.14.0'
+	implementation 'commons-logging:commons-logging-api:1.1'
+	implementation 'commons-codec:commons-codec:1.11'
+    implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
+    implementation 'org.beanshell:bsh-core:2.0b4'
+    implementation 'fr.univ-valenciennes:bzip2:1.0'
+    implementation 'com.moparisthebest:junidecode:0.1.1'
+    implementation 'org.immutables:gson:2.5.0'
+    implementation 'com.vividsolutions:jts-core:1.14.0'
 
-	compile 'com.squareup.picasso:picasso:2.71828'
+	implementation 'com.squareup.picasso:picasso:2.71828'
 // size restrictions
-// compile 'com.ibm.icu:icu4j:50.1' 
-// compile 'net.sf.trove4j:trove4j:3.0.3'
+// implementation 'com.ibm.icu:icu4j:50.1' 
+// implementation 'net.sf.trove4j:trove4j:3.0.3'
     
 	
-	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
-	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
-	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-	qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
-	qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-	compile ("com.getkeepsafe.taptargetview:taptargetview:1.6.1"){
+	legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
+	qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+	qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+	qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	implementation ("com.getkeepsafe.taptargetview:taptargetview:1.6.1"){
 		exclude group: 'com.android.support'
 	}
-	compile 'com.github.PhilJay:MPAndroidChart:v3.0.1'
-	compile ("com.github.HITGIF:TextFieldBoxes:1.3.5"){
+	implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
+	implementation ("com.github.HITGIF:TextFieldBoxes:1.3.5"){
 		exclude group: 'com.android.support'
 	}
 }
diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties
index d693eb2a9f..7dabf0f209 100644
--- a/OsmAnd/project.properties
+++ b/OsmAnd/project.properties
@@ -34,3 +34,5 @@ android.library.reference.19=aarDependencies/android.arch.lifecycle-viewmodel-1.
 android.library.reference.20=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0
 android.library.reference.21=aarDependencies/com.android.support-transition-27.1.0
 android.library.reference.22=aarDependencies/com.android.support-support-media-compat-27.1.0
+android.library.reference.23=aarDependencies/com.squareup.picasso-picasso-2.71828
+android.library.reference.24=aarDependencies/com.android.support-exifinterface-27.1.0
diff --git a/OsmAndCore-sample/build.gradle b/OsmAndCore-sample/build.gradle
index f525174904..6ed7085f94 100644
--- a/OsmAndCore-sample/build.gradle
+++ b/OsmAndCore-sample/build.gradle
@@ -118,18 +118,18 @@ repositories {
 }
 
 dependencies {
-    compile project(path: ':OsmAnd-java', configuration: 'android')
+    implementation project(path: ':OsmAnd-java', configuration: 'android')
 
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'com.android.support:appcompat-v7:27.1.0'
-    compile 'com.android.support:design:27.1.0'
-    compile 'commons-logging:commons-logging-api:1.1'
-    compile 'com.moparisthebest:junidecode:0.1.1'
+    implementation 'com.android.support:multidex:1.0.1'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:design:27.1.0'
+    implementation 'commons-logging:commons-logging-api:1.1'
+    implementation 'com.moparisthebest:junidecode:0.1.1'
 
-    compile fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
+    implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
-    compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-    debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
-    nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
-    releaseCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+    implementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+    debugImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+    nativeDebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+    releaseImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 }
diff --git a/OsmAndCore-sample/project.properties b/OsmAndCore-sample/project.properties
index 18f58d43e3..7a2e361782 100644
--- a/OsmAndCore-sample/project.properties
+++ b/OsmAndCore-sample/project.properties
@@ -14,3 +14,7 @@ android.library.reference.12=aarDependencies/com.android.support-transition-27.1
 android.library.reference.13=aarDependencies/com.android.support-recyclerview-v7-27.1.0
 android.library.reference.14=aarDependencies/net.osmand-OsmAndCore_android-0.1-SNAPSHOT
 android.library.reference.15=aarDependencies/net.osmand-OsmAndCore_androidNativeRelease-0.1-SNAPSHOT
+android.library.reference.16=aarDependencies/com.android.support-multidex-1.0.1
+android.library.reference.17=aarDependencies/android.arch.lifecycle-viewmodel-1.1.0
+android.library.reference.18=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0
+android.library.reference.19=aarDependencies/android.arch.core-runtime-1.1.0
diff --git a/build.gradle b/build.gradle
index 825da98acf..a96af76236 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,9 +13,10 @@ buildscript {
 	    classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1'
     }
 }
-apply plugin: 'com.github.ksoichiro.eclipse.aar'
 
+apply plugin: 'com.github.ksoichiro.eclipse.aar'    
 allprojects {
+    
     repositories {
         mavenCentral()
         maven {