diff --git a/android/.gitignore b/android/.gitignore
index 2ed37c8245..22b5b0cac1 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -3,7 +3,10 @@ gen/
 .settings/
 resbuilder/
 spoon-output/
+assets/
+obj/
 
+*.class
 .classpath
 .cproject
 .project
diff --git a/android/MapsWithMePro/install-run.sh b/android/MapsWithMePro/install-run.sh
deleted file mode 100755
index f05e85f58a..0000000000
--- a/android/MapsWithMePro/install-run.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#1
-adb -s S557026e32038 uninstall com.mapswithme.maps.pro
-adb -s S557026e32038 install bin/MapsWithMePro-debug.apk
-adb -s S557026e32038 shell am start -a android.intent.action.MAIN -n com.mapswithme.maps.pro/com.mapswithme.maps.DownloadResourcesActivity
-#2
-adb -s 4df1615c2383596f uninstall com.mapswithme.maps.pro
-adb -s 4df1615c2383596f install -r bin/MapsWithMePro-debug.apk
-adb -s 4df1615c2383596f shell am start -a android.intent.action.MAIN -n com.mapswithme.maps.pro/com.mapswithme.maps.DownloadResourcesActivity
-#3
-adb -s B0CB060325140SCN uninstall com.mapswithme.maps.pro
-adb -s B0CB060325140SCN install -r bin/MapsWithMePro-debug.apk
-adb -s B0CB060325140SCN shell am start -a android.intent.action.MAIN -n com.mapswithme.maps.pro/com.mapswithme.maps.DownloadResourcesActivity
diff --git a/android/script/run_monkey.sh b/android/script/run_monkey.sh
old mode 100644
new mode 100755
diff --git a/android/script/uninstall.sh b/android/script/uninstall.sh
new file mode 100755
index 0000000000..f8c8d4e00d
--- /dev/null
+++ b/android/script/uninstall.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+LITE=com.mapswithme.maps
+PRO=com.mapswithme.maps.pro 
+
+package=lp
+serial=
+
+while getopts s:p: opt; do
+  case $opt in
+  s)
+      serial=$OPTARG
+      ;;
+  p)
+      package=$OPTARG
+      ;;
+  esac
+done
+shift $((OPTIND - 1))
+    
+if [ -z $serial ]; then
+    ID=""
+else
+    ID="-s $serial"
+fi
+
+if [[ $package == *l* ]]
+then
+    echo "uninstalling $LITE"
+    adb $ID uninstall $LITE
+fi
+
+if [[ $package == *p* ]]
+then 
+    echo "uninstlling $PRO"
+    adb $ID uninstall $PRO
+fi
diff --git a/android/script/uninstall_all.sh b/android/script/uninstall_all.sh
new file mode 100644
index 0000000000..c743fc3894
--- /dev/null
+++ b/android/script/uninstall_all.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sh uninstall.sh -s $1 -p lp
diff --git a/android/script/uninstall_lite.sh b/android/script/uninstall_lite.sh
deleted file mode 100755
index d9594ce91f..0000000000
--- a/android/script/uninstall_lite.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-LITE=com.mapswithme.maps
-if [ -z $1 ]; then
-    adb uninstall $LITE
-else
-    adb -s "$1" uninstall $LITE
-fi
diff --git a/android/script/uninstall_pro.sh b/android/script/uninstall_pro.sh
deleted file mode 100755
index c56628fea0..0000000000
--- a/android/script/uninstall_pro.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-PRO=com.mapswithme.maps.pro
-if [ -z $1 ]; then
-    adb uninstall $PRO
-else
-    adb -s "$1" uninstall $PRO
-fi