diff --git a/settings.gradle b/settings.gradle
index e5085392..876426f6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':orbotservice'
+include ':tor-android-binary'
diff --git a/orbotservice/.gitignore b/tor-android-binary/.gitignore
similarity index 100%
rename from orbotservice/.gitignore
rename to tor-android-binary/.gitignore
diff --git a/orbotservice/build.gradle b/tor-android-binary/build.gradle
similarity index 100%
rename from orbotservice/build.gradle
rename to tor-android-binary/build.gradle
diff --git a/orbotservice/proguard-rules.pro b/tor-android-binary/proguard-rules.pro
similarity index 100%
rename from orbotservice/proguard-rules.pro
rename to tor-android-binary/proguard-rules.pro
diff --git a/orbotservice/src/androidTest/java/org/torproject/android/service/ApplicationTest.java b/tor-android-binary/src/androidTest/java/org/torproject/android/service/ApplicationTest.java
similarity index 100%
rename from orbotservice/src/androidTest/java/org/torproject/android/service/ApplicationTest.java
rename to tor-android-binary/src/androidTest/java/org/torproject/android/service/ApplicationTest.java
diff --git a/orbotservice/src/main/AndroidManifest.xml b/tor-android-binary/src/main/AndroidManifest.xml
similarity index 100%
rename from orbotservice/src/main/AndroidManifest.xml
rename to tor-android-binary/src/main/AndroidManifest.xml
diff --git a/orbotservice/src/main/assets/armeabi/polipo.mp3 b/tor-android-binary/src/main/assets/armeabi/polipo.mp3
similarity index 100%
rename from orbotservice/src/main/assets/armeabi/polipo.mp3
rename to tor-android-binary/src/main/assets/armeabi/polipo.mp3
diff --git a/orbotservice/src/main/assets/armeabi/tor.mp3 b/tor-android-binary/src/main/assets/armeabi/tor.mp3
similarity index 100%
rename from orbotservice/src/main/assets/armeabi/tor.mp3
rename to tor-android-binary/src/main/assets/armeabi/tor.mp3
diff --git a/orbotservice/src/main/assets/bridges.txt b/tor-android-binary/src/main/assets/bridges.txt
similarity index 100%
rename from orbotservice/src/main/assets/bridges.txt
rename to tor-android-binary/src/main/assets/bridges.txt
diff --git a/orbotservice/src/main/assets/x86/polipo.mp3 b/tor-android-binary/src/main/assets/x86/polipo.mp3
similarity index 100%
rename from orbotservice/src/main/assets/x86/polipo.mp3
rename to tor-android-binary/src/main/assets/x86/polipo.mp3
diff --git a/orbotservice/src/main/assets/x86/tor.mp3 b/tor-android-binary/src/main/assets/x86/tor.mp3
similarity index 100%
rename from orbotservice/src/main/assets/x86/tor.mp3
rename to tor-android-binary/src/main/assets/x86/tor.mp3
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore b/tor-android-binary/src/main/java/net/freehaven/tor/control/.cvsignore
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/.cvsignore
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/Bytes.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/Bytes.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/ConfigEntry.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/ConfigEntry.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/EventHandler.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/EventHandler.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/NullEventHandler.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/NullEventHandler.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/PasswordDigest.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/PasswordDigest.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/README b/tor-android-binary/src/main/java/net/freehaven/tor/control/README
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/README
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/README
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlCommands.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlCommands.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlConnection.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlConnection.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlError.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlError.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/examples/.cvsignore b/tor-android-binary/src/main/java/net/freehaven/tor/control/examples/.cvsignore
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/examples/.cvsignore
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/examples/.cvsignore
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/examples/Main.java b/tor-android-binary/src/main/java/net/freehaven/tor/control/examples/Main.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/examples/Main.java
rename to tor-android-binary/src/main/java/net/freehaven/tor/control/examples/Main.java
diff --git a/orbotservice/src/main/java/org/torproject/android/binary/TorResourceInstaller.java b/tor-android-binary/src/main/java/org/torproject/android/binary/TorResourceInstaller.java
similarity index 100%
rename from orbotservice/src/main/java/org/torproject/android/binary/TorResourceInstaller.java
rename to tor-android-binary/src/main/java/org/torproject/android/binary/TorResourceInstaller.java
diff --git a/orbotservice/src/main/java/org/torproject/android/binary/TorServiceConstants.java b/tor-android-binary/src/main/java/org/torproject/android/binary/TorServiceConstants.java
similarity index 100%
rename from orbotservice/src/main/java/org/torproject/android/binary/TorServiceConstants.java
rename to tor-android-binary/src/main/java/org/torproject/android/binary/TorServiceConstants.java
diff --git a/orbotservice/src/main/java/org/torproject/android/binary/Utils.java b/tor-android-binary/src/main/java/org/torproject/android/binary/Utils.java
similarity index 100%
rename from orbotservice/src/main/java/org/torproject/android/binary/Utils.java
rename to tor-android-binary/src/main/java/org/torproject/android/binary/Utils.java
diff --git a/orbotservice/src/main/jni/Android.mk b/tor-android-binary/src/main/jni/Android.mk
similarity index 100%
rename from orbotservice/src/main/jni/Android.mk
rename to tor-android-binary/src/main/jni/Android.mk
diff --git a/orbotservice/src/main/jni/Application.mk b/tor-android-binary/src/main/jni/Application.mk
similarity index 100%
rename from orbotservice/src/main/jni/Application.mk
rename to tor-android-binary/src/main/jni/Application.mk
diff --git a/orbotservice/src/main/jni/libancillary/API b/tor-android-binary/src/main/jni/libancillary/API
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/API
rename to tor-android-binary/src/main/jni/libancillary/API
diff --git a/orbotservice/src/main/jni/libancillary/COPYING b/tor-android-binary/src/main/jni/libancillary/COPYING
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/COPYING
rename to tor-android-binary/src/main/jni/libancillary/COPYING
diff --git a/orbotservice/src/main/jni/libancillary/Makefile b/tor-android-binary/src/main/jni/libancillary/Makefile
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/Makefile
rename to tor-android-binary/src/main/jni/libancillary/Makefile
diff --git a/orbotservice/src/main/jni/libancillary/ancillary.h b/tor-android-binary/src/main/jni/libancillary/ancillary.h
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/ancillary.h
rename to tor-android-binary/src/main/jni/libancillary/ancillary.h
diff --git a/orbotservice/src/main/jni/libancillary/fd_recv.c b/tor-android-binary/src/main/jni/libancillary/fd_recv.c
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/fd_recv.c
rename to tor-android-binary/src/main/jni/libancillary/fd_recv.c
diff --git a/orbotservice/src/main/jni/libancillary/fd_send.c b/tor-android-binary/src/main/jni/libancillary/fd_send.c
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/fd_send.c
rename to tor-android-binary/src/main/jni/libancillary/fd_send.c
diff --git a/orbotservice/src/main/jni/libancillary/test.c b/tor-android-binary/src/main/jni/libancillary/test.c
similarity index 100%
rename from orbotservice/src/main/jni/libancillary/test.c
rename to tor-android-binary/src/main/jni/libancillary/test.c
diff --git a/orbotservice/src/main/jni/pdnsd/AUTHORS b/tor-android-binary/src/main/jni/pdnsd/AUTHORS
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/AUTHORS
rename to tor-android-binary/src/main/jni/pdnsd/AUTHORS
diff --git a/orbotservice/src/main/jni/pdnsd/COPYING b/tor-android-binary/src/main/jni/pdnsd/COPYING
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/COPYING
rename to tor-android-binary/src/main/jni/pdnsd/COPYING
diff --git a/orbotservice/src/main/jni/pdnsd/COPYING.BSD b/tor-android-binary/src/main/jni/pdnsd/COPYING.BSD
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/COPYING.BSD
rename to tor-android-binary/src/main/jni/pdnsd/COPYING.BSD
diff --git a/orbotservice/src/main/jni/pdnsd/ChangeLog b/tor-android-binary/src/main/jni/pdnsd/ChangeLog
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/ChangeLog
rename to tor-android-binary/src/main/jni/pdnsd/ChangeLog
diff --git a/orbotservice/src/main/jni/pdnsd/ChangeLog.old b/tor-android-binary/src/main/jni/pdnsd/ChangeLog.old
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/ChangeLog.old
rename to tor-android-binary/src/main/jni/pdnsd/ChangeLog.old
diff --git a/orbotservice/src/main/jni/pdnsd/INSTALL b/tor-android-binary/src/main/jni/pdnsd/INSTALL
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/INSTALL
rename to tor-android-binary/src/main/jni/pdnsd/INSTALL
diff --git a/orbotservice/src/main/jni/pdnsd/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/NEWS b/tor-android-binary/src/main/jni/pdnsd/NEWS
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/NEWS
rename to tor-android-binary/src/main/jni/pdnsd/NEWS
diff --git a/orbotservice/src/main/jni/pdnsd/PKGBUILD.in b/tor-android-binary/src/main/jni/pdnsd/PKGBUILD.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/PKGBUILD.in
rename to tor-android-binary/src/main/jni/pdnsd/PKGBUILD.in
diff --git a/orbotservice/src/main/jni/pdnsd/README b/tor-android-binary/src/main/jni/pdnsd/README
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/README
rename to tor-android-binary/src/main/jni/pdnsd/README
diff --git a/orbotservice/src/main/jni/pdnsd/README.par b/tor-android-binary/src/main/jni/pdnsd/README.par
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/README.par
rename to tor-android-binary/src/main/jni/pdnsd/README.par
diff --git a/orbotservice/src/main/jni/pdnsd/README.par.old b/tor-android-binary/src/main/jni/pdnsd/README.par.old
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/README.par.old
rename to tor-android-binary/src/main/jni/pdnsd/README.par.old
diff --git a/orbotservice/src/main/jni/pdnsd/THANKS b/tor-android-binary/src/main/jni/pdnsd/THANKS
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/THANKS
rename to tor-android-binary/src/main/jni/pdnsd/THANKS
diff --git a/orbotservice/src/main/jni/pdnsd/TODO b/tor-android-binary/src/main/jni/pdnsd/TODO
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/TODO
rename to tor-android-binary/src/main/jni/pdnsd/TODO
diff --git a/orbotservice/src/main/jni/pdnsd/acconfig.h b/tor-android-binary/src/main/jni/pdnsd/acconfig.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/acconfig.h
rename to tor-android-binary/src/main/jni/pdnsd/acconfig.h
diff --git a/orbotservice/src/main/jni/pdnsd/aclocal.m4 b/tor-android-binary/src/main/jni/pdnsd/aclocal.m4
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/aclocal.m4
rename to tor-android-binary/src/main/jni/pdnsd/aclocal.m4
diff --git a/orbotservice/src/main/jni/pdnsd/compile b/tor-android-binary/src/main/jni/pdnsd/compile
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/compile
rename to tor-android-binary/src/main/jni/pdnsd/compile
diff --git a/orbotservice/src/main/jni/pdnsd/config.h b/tor-android-binary/src/main/jni/pdnsd/config.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/config.h
rename to tor-android-binary/src/main/jni/pdnsd/config.h
diff --git a/orbotservice/src/main/jni/pdnsd/config.h.in b/tor-android-binary/src/main/jni/pdnsd/config.h.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/config.h.in
rename to tor-android-binary/src/main/jni/pdnsd/config.h.in
diff --git a/orbotservice/src/main/jni/pdnsd/configure b/tor-android-binary/src/main/jni/pdnsd/configure
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/configure
rename to tor-android-binary/src/main/jni/pdnsd/configure
diff --git a/orbotservice/src/main/jni/pdnsd/configure.in b/tor-android-binary/src/main/jni/pdnsd/configure.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/configure.in
rename to tor-android-binary/src/main/jni/pdnsd/configure.in
diff --git a/orbotservice/src/main/jni/pdnsd/contrib/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/contrib/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/contrib/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/contrib/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/contrib/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/contrib/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/contrib/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/contrib/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/contrib/README b/tor-android-binary/src/main/jni/pdnsd/contrib/README
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/contrib/README
rename to tor-android-binary/src/main/jni/pdnsd/contrib/README
diff --git a/orbotservice/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl b/tor-android-binary/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl
rename to tor-android-binary/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl
diff --git a/orbotservice/src/main/jni/pdnsd/contrib/dhcp2pdnsd b/tor-android-binary/src/main/jni/pdnsd/contrib/dhcp2pdnsd
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/contrib/dhcp2pdnsd
rename to tor-android-binary/src/main/jni/pdnsd/contrib/dhcp2pdnsd
diff --git a/orbotservice/src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl b/tor-android-binary/src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl
rename to tor-android-binary/src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl
diff --git a/orbotservice/src/main/jni/pdnsd/depcomp b/tor-android-binary/src/main/jni/pdnsd/depcomp
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/depcomp
rename to tor-android-binary/src/main/jni/pdnsd/depcomp
diff --git a/orbotservice/src/main/jni/pdnsd/file-list.base.in b/tor-android-binary/src/main/jni/pdnsd/file-list.base.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/file-list.base.in
rename to tor-android-binary/src/main/jni/pdnsd/file-list.base.in
diff --git a/orbotservice/src/main/jni/pdnsd/install-sh b/tor-android-binary/src/main/jni/pdnsd/install-sh
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/install-sh
rename to tor-android-binary/src/main/jni/pdnsd/install-sh
diff --git a/orbotservice/src/main/jni/pdnsd/missing b/tor-android-binary/src/main/jni/pdnsd/missing
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/missing
rename to tor-android-binary/src/main/jni/pdnsd/missing
diff --git a/orbotservice/src/main/jni/pdnsd/pdnsd.spec.in b/tor-android-binary/src/main/jni/pdnsd/pdnsd.spec.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/pdnsd.spec.in
rename to tor-android-binary/src/main/jni/pdnsd/pdnsd.spec.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/cache.c b/tor-android-binary/src/main/jni/pdnsd/src/cache.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/cache.c
rename to tor-android-binary/src/main/jni/pdnsd/src/cache.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/cache.h b/tor-android-binary/src/main/jni/pdnsd/src/cache.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/cache.h
rename to tor-android-binary/src/main/jni/pdnsd/src/cache.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/conf-keywords.h b/tor-android-binary/src/main/jni/pdnsd/src/conf-keywords.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/conf-keywords.h
rename to tor-android-binary/src/main/jni/pdnsd/src/conf-keywords.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/conf-parser.c b/tor-android-binary/src/main/jni/pdnsd/src/conf-parser.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/conf-parser.c
rename to tor-android-binary/src/main/jni/pdnsd/src/conf-parser.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/conf-parser.h b/tor-android-binary/src/main/jni/pdnsd/src/conf-parser.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/conf-parser.h
rename to tor-android-binary/src/main/jni/pdnsd/src/conf-parser.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/conff.c b/tor-android-binary/src/main/jni/pdnsd/src/conff.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/conff.c
rename to tor-android-binary/src/main/jni/pdnsd/src/conff.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/conff.h b/tor-android-binary/src/main/jni/pdnsd/src/conff.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/conff.h
rename to tor-android-binary/src/main/jni/pdnsd/src/conff.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/consts.c b/tor-android-binary/src/main/jni/pdnsd/src/consts.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/consts.c
rename to tor-android-binary/src/main/jni/pdnsd/src/consts.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/consts.h b/tor-android-binary/src/main/jni/pdnsd/src/consts.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/consts.h
rename to tor-android-binary/src/main/jni/pdnsd/src/consts.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/debug.c b/tor-android-binary/src/main/jni/pdnsd/src/debug.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/debug.c
rename to tor-android-binary/src/main/jni/pdnsd/src/debug.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/debug.h b/tor-android-binary/src/main/jni/pdnsd/src/debug.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/debug.h
rename to tor-android-binary/src/main/jni/pdnsd/src/debug.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/dns.c b/tor-android-binary/src/main/jni/pdnsd/src/dns.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/dns.c
rename to tor-android-binary/src/main/jni/pdnsd/src/dns.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/dns.h b/tor-android-binary/src/main/jni/pdnsd/src/dns.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/dns.h
rename to tor-android-binary/src/main/jni/pdnsd/src/dns.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/dns_answer.c b/tor-android-binary/src/main/jni/pdnsd/src/dns_answer.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/dns_answer.c
rename to tor-android-binary/src/main/jni/pdnsd/src/dns_answer.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/dns_answer.h b/tor-android-binary/src/main/jni/pdnsd/src/dns_answer.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/dns_answer.h
rename to tor-android-binary/src/main/jni/pdnsd/src/dns_answer.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/dns_query.c b/tor-android-binary/src/main/jni/pdnsd/src/dns_query.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/dns_query.c
rename to tor-android-binary/src/main/jni/pdnsd/src/dns_query.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/dns_query.h b/tor-android-binary/src/main/jni/pdnsd/src/dns_query.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/dns_query.h
rename to tor-android-binary/src/main/jni/pdnsd/src/dns_query.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/error.c b/tor-android-binary/src/main/jni/pdnsd/src/error.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/error.c
rename to tor-android-binary/src/main/jni/pdnsd/src/error.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/error.h b/tor-android-binary/src/main/jni/pdnsd/src/error.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/error.h
rename to tor-android-binary/src/main/jni/pdnsd/src/error.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h b/tor-android-binary/src/main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h
rename to tor-android-binary/src/main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/hash.c b/tor-android-binary/src/main/jni/pdnsd/src/hash.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/hash.c
rename to tor-android-binary/src/main/jni/pdnsd/src/hash.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/hash.h b/tor-android-binary/src/main/jni/pdnsd/src/hash.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/hash.h
rename to tor-android-binary/src/main/jni/pdnsd/src/hash.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/helpers.c b/tor-android-binary/src/main/jni/pdnsd/src/helpers.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/helpers.c
rename to tor-android-binary/src/main/jni/pdnsd/src/helpers.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/helpers.h b/tor-android-binary/src/main/jni/pdnsd/src/helpers.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/helpers.h
rename to tor-android-binary/src/main/jni/pdnsd/src/helpers.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/icmp.c b/tor-android-binary/src/main/jni/pdnsd/src/icmp.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/icmp.c
rename to tor-android-binary/src/main/jni/pdnsd/src/icmp.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/icmp.h b/tor-android-binary/src/main/jni/pdnsd/src/icmp.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/icmp.h
rename to tor-android-binary/src/main/jni/pdnsd/src/icmp.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/ipvers.h b/tor-android-binary/src/main/jni/pdnsd/src/ipvers.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/ipvers.h
rename to tor-android-binary/src/main/jni/pdnsd/src/ipvers.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/list.c b/tor-android-binary/src/main/jni/pdnsd/src/list.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/list.c
rename to tor-android-binary/src/main/jni/pdnsd/src/list.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/list.h b/tor-android-binary/src/main/jni/pdnsd/src/list.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/list.h
rename to tor-android-binary/src/main/jni/pdnsd/src/list.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/main.c b/tor-android-binary/src/main/jni/pdnsd/src/main.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/main.c
rename to tor-android-binary/src/main/jni/pdnsd/src/main.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/make_rr_types_h.pl b/tor-android-binary/src/main/jni/pdnsd/src/make_rr_types_h.pl
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/make_rr_types_h.pl
rename to tor-android-binary/src/main/jni/pdnsd/src/make_rr_types_h.pl
diff --git a/orbotservice/src/main/jni/pdnsd/src/netdev.c b/tor-android-binary/src/main/jni/pdnsd/src/netdev.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/netdev.c
rename to tor-android-binary/src/main/jni/pdnsd/src/netdev.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/netdev.h b/tor-android-binary/src/main/jni/pdnsd/src/netdev.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/netdev.h
rename to tor-android-binary/src/main/jni/pdnsd/src/netdev.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c b/tor-android-binary/src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c
rename to tor-android-binary/src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/pdnsd_assert.h b/tor-android-binary/src/main/jni/pdnsd/src/pdnsd_assert.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/pdnsd_assert.h
rename to tor-android-binary/src/main/jni/pdnsd/src/pdnsd_assert.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Debian/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/rc/Debian/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Debian/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Debian/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Debian/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/Debian/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Debian/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Debian/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Debian/pdnsd.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/Debian/pdnsd.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Debian/pdnsd.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Debian/pdnsd.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/rc/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/README b/tor-android-binary/src/main/jni/pdnsd/src/rc/README
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/README
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/README
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/RedHat/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/rc/RedHat/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/RedHat/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/RedHat/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/RedHat/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/RedHat/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/RedHat/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/RedHat/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Slackware/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/rc/Slackware/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Slackware/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Slackware/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Slackware/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/Slackware/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Slackware/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Slackware/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/SuSE/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/rc/SuSE/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/SuSE/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/SuSE/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/SuSE/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/SuSE/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/SuSE/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/SuSE/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in b/tor-android-binary/src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/rr_types.c b/tor-android-binary/src/main/jni/pdnsd/src/rr_types.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rr_types.c
rename to tor-android-binary/src/main/jni/pdnsd/src/rr_types.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/rr_types.h b/tor-android-binary/src/main/jni/pdnsd/src/rr_types.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rr_types.h
rename to tor-android-binary/src/main/jni/pdnsd/src/rr_types.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/rr_types.in b/tor-android-binary/src/main/jni/pdnsd/src/rr_types.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/rr_types.in
rename to tor-android-binary/src/main/jni/pdnsd/src/rr_types.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/servers.c b/tor-android-binary/src/main/jni/pdnsd/src/servers.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/servers.c
rename to tor-android-binary/src/main/jni/pdnsd/src/servers.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/servers.h b/tor-android-binary/src/main/jni/pdnsd/src/servers.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/servers.h
rename to tor-android-binary/src/main/jni/pdnsd/src/servers.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/sort_namevalues.pl b/tor-android-binary/src/main/jni/pdnsd/src/sort_namevalues.pl
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/sort_namevalues.pl
rename to tor-android-binary/src/main/jni/pdnsd/src/sort_namevalues.pl
diff --git a/orbotservice/src/main/jni/pdnsd/src/status.c b/tor-android-binary/src/main/jni/pdnsd/src/status.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/status.c
rename to tor-android-binary/src/main/jni/pdnsd/src/status.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/status.h b/tor-android-binary/src/main/jni/pdnsd/src/status.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/status.h
rename to tor-android-binary/src/main/jni/pdnsd/src/status.h
diff --git a/orbotservice/src/main/jni/pdnsd/src/test/Makefile.am b/tor-android-binary/src/main/jni/pdnsd/src/test/Makefile.am
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/test/Makefile.am
rename to tor-android-binary/src/main/jni/pdnsd/src/test/Makefile.am
diff --git a/orbotservice/src/main/jni/pdnsd/src/test/Makefile.in b/tor-android-binary/src/main/jni/pdnsd/src/test/Makefile.in
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/test/Makefile.in
rename to tor-android-binary/src/main/jni/pdnsd/src/test/Makefile.in
diff --git a/orbotservice/src/main/jni/pdnsd/src/test/if_up.c b/tor-android-binary/src/main/jni/pdnsd/src/test/if_up.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/test/if_up.c
rename to tor-android-binary/src/main/jni/pdnsd/src/test/if_up.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/test/is_local_addr.c b/tor-android-binary/src/main/jni/pdnsd/src/test/is_local_addr.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/test/is_local_addr.c
rename to tor-android-binary/src/main/jni/pdnsd/src/test/is_local_addr.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/test/random.c b/tor-android-binary/src/main/jni/pdnsd/src/test/random.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/test/random.c
rename to tor-android-binary/src/main/jni/pdnsd/src/test/random.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/test/tping.c b/tor-android-binary/src/main/jni/pdnsd/src/test/tping.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/test/tping.c
rename to tor-android-binary/src/main/jni/pdnsd/src/test/tping.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/thread.c b/tor-android-binary/src/main/jni/pdnsd/src/thread.c
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/thread.c
rename to tor-android-binary/src/main/jni/pdnsd/src/thread.c
diff --git a/orbotservice/src/main/jni/pdnsd/src/thread.h b/tor-android-binary/src/main/jni/pdnsd/src/thread.h
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/src/thread.h
rename to tor-android-binary/src/main/jni/pdnsd/src/thread.h
diff --git a/orbotservice/src/main/jni/pdnsd/version b/tor-android-binary/src/main/jni/pdnsd/version
similarity index 100%
rename from orbotservice/src/main/jni/pdnsd/version
rename to tor-android-binary/src/main/jni/pdnsd/version
diff --git a/orbotservice/src/main/jniLibs b/tor-android-binary/src/main/jniLibs
similarity index 100%
rename from orbotservice/src/main/jniLibs
rename to tor-android-binary/src/main/jniLibs
diff --git a/tor-android-binary/src/main/libs/armeabi/libtun2socks.so b/tor-android-binary/src/main/libs/armeabi/libtun2socks.so
new file mode 100755
index 00000000..6e9ea8a7
Binary files /dev/null and b/tor-android-binary/src/main/libs/armeabi/libtun2socks.so differ
diff --git a/tor-android-binary/src/main/libs/armeabi/pdnsd b/tor-android-binary/src/main/libs/armeabi/pdnsd
new file mode 100755
index 00000000..5b629ca6
Binary files /dev/null and b/tor-android-binary/src/main/libs/armeabi/pdnsd differ
diff --git a/tor-android-binary/src/main/libs/x86/libtun2socks.so b/tor-android-binary/src/main/libs/x86/libtun2socks.so
new file mode 100755
index 00000000..7e37a7e0
Binary files /dev/null and b/tor-android-binary/src/main/libs/x86/libtun2socks.so differ
diff --git a/orbotservice/src/main/res/raw/geoip.mp3 b/tor-android-binary/src/main/res/raw/geoip.mp3
similarity index 100%
rename from orbotservice/src/main/res/raw/geoip.mp3
rename to tor-android-binary/src/main/res/raw/geoip.mp3
diff --git a/orbotservice/src/main/res/raw/geoip6.mp3 b/tor-android-binary/src/main/res/raw/geoip6.mp3
similarity index 100%
rename from orbotservice/src/main/res/raw/geoip6.mp3
rename to tor-android-binary/src/main/res/raw/geoip6.mp3
diff --git a/orbotservice/src/main/res/raw/pluto.properties b/tor-android-binary/src/main/res/raw/pluto.properties
similarity index 100%
rename from orbotservice/src/main/res/raw/pluto.properties
rename to tor-android-binary/src/main/res/raw/pluto.properties
diff --git a/orbotservice/src/main/res/raw/torpolipo.conf b/tor-android-binary/src/main/res/raw/torpolipo.conf
similarity index 100%
rename from orbotservice/src/main/res/raw/torpolipo.conf
rename to tor-android-binary/src/main/res/raw/torpolipo.conf
diff --git a/orbotservice/src/main/res/raw/torrc b/tor-android-binary/src/main/res/raw/torrc
similarity index 100%
rename from orbotservice/src/main/res/raw/torrc
rename to tor-android-binary/src/main/res/raw/torrc
diff --git a/orbotservice/src/main/res/values/pdnsd.xml b/tor-android-binary/src/main/res/values/pdnsd.xml
similarity index 100%
rename from orbotservice/src/main/res/values/pdnsd.xml
rename to tor-android-binary/src/main/res/values/pdnsd.xml
diff --git a/orbotservice/src/test/java/org/torproject/android/control/.cvsignore b/tor-android-binary/src/test/java/org/torproject/android/control/.cvsignore
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/.cvsignore
rename to tor-android-binary/src/test/java/org/torproject/android/control/.cvsignore
diff --git a/orbotservice/src/test/java/org/torproject/android/control/Bytes.java b/tor-android-binary/src/test/java/org/torproject/android/control/Bytes.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/Bytes.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/Bytes.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/ConfigEntry.java b/tor-android-binary/src/test/java/org/torproject/android/control/ConfigEntry.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/ConfigEntry.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/ConfigEntry.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/EventHandler.java b/tor-android-binary/src/test/java/org/torproject/android/control/EventHandler.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/EventHandler.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/EventHandler.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java b/tor-android-binary/src/test/java/org/torproject/android/control/NullEventHandler.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/NullEventHandler.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/PasswordDigest.java b/tor-android-binary/src/test/java/org/torproject/android/control/PasswordDigest.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/PasswordDigest.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/PasswordDigest.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/README b/tor-android-binary/src/test/java/org/torproject/android/control/README
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/README
rename to tor-android-binary/src/test/java/org/torproject/android/control/README
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlCommands.java b/tor-android-binary/src/test/java/org/torproject/android/control/TorControlCommands.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/TorControlCommands.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/TorControlCommands.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlConnection.java b/tor-android-binary/src/test/java/org/torproject/android/control/TorControlConnection.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/TorControlConnection.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/TorControlConnection.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlError.java b/tor-android-binary/src/test/java/org/torproject/android/control/TorControlError.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/TorControlError.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/TorControlError.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlSyntaxError.java b/tor-android-binary/src/test/java/org/torproject/android/control/TorControlSyntaxError.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/TorControlSyntaxError.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/TorControlSyntaxError.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/examples/.cvsignore b/tor-android-binary/src/test/java/org/torproject/android/control/examples/.cvsignore
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/examples/.cvsignore
rename to tor-android-binary/src/test/java/org/torproject/android/control/examples/.cvsignore
diff --git a/orbotservice/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java b/tor-android-binary/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java
diff --git a/orbotservice/src/test/java/org/torproject/android/control/examples/Main.java b/tor-android-binary/src/test/java/org/torproject/android/control/examples/Main.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/control/examples/Main.java
rename to tor-android-binary/src/test/java/org/torproject/android/control/examples/Main.java
diff --git a/orbotservice/src/test/java/org/torproject/android/service/ExampleUnitTest.java b/tor-android-binary/src/test/java/org/torproject/android/service/ExampleUnitTest.java
similarity index 100%
rename from orbotservice/src/test/java/org/torproject/android/service/ExampleUnitTest.java
rename to tor-android-binary/src/test/java/org/torproject/android/service/ExampleUnitTest.java