diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
index 6306562762..ccc9733e52 100644
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@@ -4,5 +4,4 @@ local.properties
 raw/
 obj/
 cpd.xml
-libs/
 jni/Local.mk
diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 551d446d13..24666b56c3 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -181,16 +181,16 @@
 
 	<!-- Compiles this project's .java files into .class files. -->
     <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
+    	<!-- osmchange : Osmand plus support -->
+        <mkdir dir="${gen.absolute.dir}/net/osmand/plus"/>
+        <copy todir="${gen.absolute.dir}/net/osmand/plus">
+          	<fileset dir="${gen.absolute.dir}/net/osmand">
+    	       <include name="R.java" />
+ 	        </fileset>
+	    </copy>
+	    <replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package net.osmand;' replace='package net.osmand.plus;' byline="true" />
+		<!-- osmchange : Osmand plus support -->    	
         <do-only-if-manifest-hasCode elseText="hasCode = false. Skipping...">
-			<!-- osmchange : Osmand plus support -->
-            <mkdir dir="${gen.absolute.dir}/net/osmand/plus"/>
-            <copy todir="${gen.absolute.dir}/net/osmand/plus">
-                <fileset dir="${gen.absolute.dir}/net/osmand">
-                    <include name="R.java" />
-                </fileset>
-            </copy>
-            <replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package net.osmand;' replace='package net.osmand.plus;' byline="true" />
-			<!-- osmchange : Osmand plus support -->
             <!-- If android rules are used for a test project, its classpath should include
                  tested project's location -->
             <condition property="extensible.classpath"
diff --git a/OsmAnd/libs/.gitignore b/OsmAnd/libs/.gitignore
new file mode 100644
index 0000000000..4a652042b4
--- /dev/null
+++ b/OsmAnd/libs/.gitignore
@@ -0,0 +1,3 @@
+armeabi/
+x86/
+armeabi-v7a/
diff --git a/OsmAnd/lib/bsh-core-2.0b4.jar b/OsmAnd/libs/bsh-core-2.0b4.jar
similarity index 100%
rename from OsmAnd/lib/bsh-core-2.0b4.jar
rename to OsmAnd/libs/bsh-core-2.0b4.jar
diff --git a/OsmAnd/lib/bzip2-20090327.jar b/OsmAnd/libs/bzip2-20090327.jar
similarity index 100%
rename from OsmAnd/lib/bzip2-20090327.jar
rename to OsmAnd/libs/bzip2-20090327.jar
diff --git a/OsmAnd/lib/junidecode-0.1.jar b/OsmAnd/libs/junidecode-0.1.jar
similarity index 100%
rename from OsmAnd/lib/junidecode-0.1.jar
rename to OsmAnd/libs/junidecode-0.1.jar
diff --git a/OsmAnd/lib/tuprolog.jar b/OsmAnd/libs/tuprolog.jar
similarity index 100%
rename from OsmAnd/lib/tuprolog.jar
rename to OsmAnd/libs/tuprolog.jar