diff --git a/build.pl b/build.pl
index 907b1388a..3bdaaa29a 100755
--- a/build.pl
+++ b/build.pl
@@ -328,7 +328,7 @@ TARGET: lib/go/blobserver/localdisk
 
 TARGET: lib/go/httprange
 
-TARGET: clients/android/uploader
+TARGET: clients/android
     =not_in_all  # too slow
 
 TARGET: lib/go/mysqlindexer
diff --git a/clients/android/uploader/.classpath b/clients/android/.classpath
similarity index 100%
rename from clients/android/uploader/.classpath
rename to clients/android/.classpath
diff --git a/clients/android/uploader/.gitignore b/clients/android/.gitignore
similarity index 100%
rename from clients/android/uploader/.gitignore
rename to clients/android/.gitignore
diff --git a/clients/android/uploader/.project b/clients/android/.project
similarity index 100%
rename from clients/android/uploader/.project
rename to clients/android/.project
diff --git a/clients/android/uploader/.settings/org.eclipse.jdt.core.prefs b/clients/android/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from clients/android/uploader/.settings/org.eclipse.jdt.core.prefs
rename to clients/android/.settings/org.eclipse.jdt.core.prefs
diff --git a/clients/android/uploader/AndroidManifest.xml b/clients/android/AndroidManifest.xml
similarity index 98%
rename from clients/android/uploader/AndroidManifest.xml
rename to clients/android/AndroidManifest.xml
index ec19a2f9b..b7c3b0b3c 100644
--- a/clients/android/uploader/AndroidManifest.xml
+++ b/clients/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.danga.camli"
+      package="org.camlistore"
       android:versionCode="1"
       android:versionName="1.0">
 
diff --git a/clients/android/uploader/Makefile b/clients/android/Makefile
similarity index 100%
rename from clients/android/uploader/Makefile
rename to clients/android/Makefile
diff --git a/clients/android/uploader/build.properties b/clients/android/build.properties
similarity index 100%
rename from clients/android/uploader/build.properties
rename to clients/android/build.properties
diff --git a/clients/android/uploader/build.xml b/clients/android/build.xml
similarity index 100%
rename from clients/android/uploader/build.xml
rename to clients/android/build.xml
diff --git a/clients/android/uploader/default.properties b/clients/android/default.properties
similarity index 100%
rename from clients/android/uploader/default.properties
rename to clients/android/default.properties
diff --git a/clients/android/uploader/res/drawable/icon.png b/clients/android/res/drawable/icon.png
similarity index 100%
rename from clients/android/uploader/res/drawable/icon.png
rename to clients/android/res/drawable/icon.png
diff --git a/clients/android/uploader/res/layout/main.xml b/clients/android/res/layout/main.xml
similarity index 100%
rename from clients/android/uploader/res/layout/main.xml
rename to clients/android/res/layout/main.xml
diff --git a/clients/android/uploader/res/values/strings.xml b/clients/android/res/values/strings.xml
similarity index 100%
rename from clients/android/uploader/res/values/strings.xml
rename to clients/android/res/values/strings.xml
diff --git a/clients/android/uploader/res/xml/preferences.xml b/clients/android/res/xml/preferences.xml
similarity index 100%
rename from clients/android/uploader/res/xml/preferences.xml
rename to clients/android/res/xml/preferences.xml
diff --git a/clients/android/uploader/src/com/danga/camli/CamliActivity.java b/clients/android/src/org/camlistore/CamliActivity.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/CamliActivity.java
rename to clients/android/src/org/camlistore/CamliActivity.java
index a1bcfe63d..4ada8fc51 100644
--- a/clients/android/uploader/src/com/danga/camli/CamliActivity.java
+++ b/clients/android/src/org/camlistore/CamliActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.app.Activity;
 import android.content.ComponentName;
diff --git a/clients/android/uploader/src/com/danga/camli/CamliFileObserver.java b/clients/android/src/org/camlistore/CamliFileObserver.java
similarity index 96%
rename from clients/android/uploader/src/com/danga/camli/CamliFileObserver.java
rename to clients/android/src/org/camlistore/CamliFileObserver.java
index 4fc99d6af..2b9032c0c 100644
--- a/clients/android/uploader/src/com/danga/camli/CamliFileObserver.java
+++ b/clients/android/src/org/camlistore/CamliFileObserver.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.File;
 
@@ -23,7 +23,7 @@ import android.os.FileObserver;
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.danga.camli.IUploadService.Stub;
+import org.camlistore.IUploadService.Stub;
 
 public class CamliFileObserver extends FileObserver {
     private static final String TAG = "CamliFileObserver";
diff --git a/clients/android/uploader/src/com/danga/camli/DummyNullCallback.java b/clients/android/src/org/camlistore/DummyNullCallback.java
similarity index 98%
rename from clients/android/uploader/src/com/danga/camli/DummyNullCallback.java
rename to clients/android/src/org/camlistore/DummyNullCallback.java
index 78e02f5ef..d8ca58aa9 100644
--- a/clients/android/uploader/src/com/danga/camli/DummyNullCallback.java
+++ b/clients/android/src/org/camlistore/DummyNullCallback.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.os.RemoteException;
 
diff --git a/clients/android/uploader/src/com/danga/camli/HostPort.java b/clients/android/src/org/camlistore/HostPort.java
similarity index 98%
rename from clients/android/uploader/src/com/danga/camli/HostPort.java
rename to clients/android/src/org/camlistore/HostPort.java
index 960c3f3a0..0ac7e1a3d 100644
--- a/clients/android/uploader/src/com/danga/camli/HostPort.java
+++ b/clients/android/src/org/camlistore/HostPort.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 public class HostPort {
     private final boolean mValid;
diff --git a/clients/android/uploader/src/com/danga/camli/IStatusCallback.aidl b/clients/android/src/org/camlistore/IStatusCallback.aidl
similarity index 97%
rename from clients/android/uploader/src/com/danga/camli/IStatusCallback.aidl
rename to clients/android/src/org/camlistore/IStatusCallback.aidl
index 0722ab904..fb1777b4d 100644
--- a/clients/android/uploader/src/com/danga/camli/IStatusCallback.aidl
+++ b/clients/android/src/org/camlistore/IStatusCallback.aidl
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 oneway interface IStatusCallback {
     void logToClient(String stuff);
diff --git a/clients/android/uploader/src/com/danga/camli/IUploadService.aidl b/clients/android/src/org/camlistore/IUploadService.aidl
similarity index 95%
rename from clients/android/uploader/src/com/danga/camli/IUploadService.aidl
rename to clients/android/src/org/camlistore/IUploadService.aidl
index 3efd079a6..056e0c7f6 100644
--- a/clients/android/uploader/src/com/danga/camli/IUploadService.aidl
+++ b/clients/android/src/org/camlistore/IUploadService.aidl
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
-import com.danga.camli.IStatusCallback;
+import org.camlistore.IStatusCallback;
 import android.os.ParcelFileDescriptor;
 import android.net.Uri;
 import java.util.List;
diff --git a/clients/android/uploader/src/com/danga/camli/OnAlarmReceiver.java b/clients/android/src/org/camlistore/OnAlarmReceiver.java
similarity index 97%
rename from clients/android/uploader/src/com/danga/camli/OnAlarmReceiver.java
rename to clients/android/src/org/camlistore/OnAlarmReceiver.java
index aa14b538d..38b117963 100644
--- a/clients/android/uploader/src/com/danga/camli/OnAlarmReceiver.java
+++ b/clients/android/src/org/camlistore/OnAlarmReceiver.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/clients/android/uploader/src/com/danga/camli/OnBootReceiver.java b/clients/android/src/org/camlistore/OnBootReceiver.java
similarity index 98%
rename from clients/android/uploader/src/com/danga/camli/OnBootReceiver.java
rename to clients/android/src/org/camlistore/OnBootReceiver.java
index 6b642681e..4f3be9a46 100644
--- a/clients/android/uploader/src/com/danga/camli/OnBootReceiver.java
+++ b/clients/android/src/org/camlistore/OnBootReceiver.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
diff --git a/clients/android/uploader/src/com/danga/camli/Preferences.java b/clients/android/src/org/camlistore/Preferences.java
similarity index 98%
rename from clients/android/uploader/src/com/danga/camli/Preferences.java
rename to clients/android/src/org/camlistore/Preferences.java
index 027b38010..78c20ac80 100644
--- a/clients/android/uploader/src/com/danga/camli/Preferences.java
+++ b/clients/android/src/org/camlistore/Preferences.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.SharedPreferences;
 
diff --git a/clients/android/uploader/src/com/danga/camli/QueuedFile.java b/clients/android/src/org/camlistore/QueuedFile.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/QueuedFile.java
rename to clients/android/src/org/camlistore/QueuedFile.java
index 134fe834b..4fa83378e 100644
--- a/clients/android/uploader/src/com/danga/camli/QueuedFile.java
+++ b/clients/android/src/org/camlistore/QueuedFile.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.net.Uri;
 
diff --git a/clients/android/uploader/src/com/danga/camli/SettingsActivity.java b/clients/android/src/org/camlistore/SettingsActivity.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/SettingsActivity.java
rename to clients/android/src/org/camlistore/SettingsActivity.java
index 42b47be2a..36da48f40 100644
--- a/clients/android/uploader/src/com/danga/camli/SettingsActivity.java
+++ b/clients/android/src/org/camlistore/SettingsActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/clients/android/uploader/src/com/danga/camli/UploadApplication.java b/clients/android/src/org/camlistore/UploadApplication.java
similarity index 98%
rename from clients/android/uploader/src/com/danga/camli/UploadApplication.java
rename to clients/android/src/org/camlistore/UploadApplication.java
index 06b700af3..ce1bd8e42 100644
--- a/clients/android/uploader/src/com/danga/camli/UploadApplication.java
+++ b/clients/android/src/org/camlistore/UploadApplication.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.app.Application;
 import android.util.Config;
@@ -48,4 +48,4 @@ public class UploadApplication extends Application {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/clients/android/uploader/src/com/danga/camli/UploadService.java b/clients/android/src/org/camlistore/UploadService.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/UploadService.java
rename to clients/android/src/org/camlistore/UploadService.java
index e0cd00946..b40d79f83 100644
--- a/clients/android/uploader/src/com/danga/camli/UploadService.java
+++ b/clients/android/src/org/camlistore/UploadService.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/clients/android/uploader/src/com/danga/camli/UploadThread.java b/clients/android/src/org/camlistore/UploadThread.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/UploadThread.java
rename to clients/android/src/org/camlistore/UploadThread.java
index 26b1c09cf..a75c8b74e 100644
--- a/clients/android/uploader/src/com/danga/camli/UploadThread.java
+++ b/clients/android/src/org/camlistore/UploadThread.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.BufferedOutputStream;
 import java.io.FileInputStream;
diff --git a/clients/android/uploader/src/com/danga/camli/Util.java b/clients/android/src/org/camlistore/Util.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/Util.java
rename to clients/android/src/org/camlistore/Util.java
index 94435aa8f..d1ada94d6 100644
--- a/clients/android/uploader/src/com/danga/camli/Util.java
+++ b/clients/android/src/org/camlistore/Util.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.BufferedInputStream;
 import java.io.FileDescriptor;
diff --git a/clients/android/uploader/src/com/danga/camli/WifiPowerReceiver.java b/clients/android/src/org/camlistore/WifiPowerReceiver.java
similarity index 99%
rename from clients/android/uploader/src/com/danga/camli/WifiPowerReceiver.java
rename to clients/android/src/org/camlistore/WifiPowerReceiver.java
index 251349c0a..818df9836 100644
--- a/clients/android/uploader/src/com/danga/camli/WifiPowerReceiver.java
+++ b/clients/android/src/org/camlistore/WifiPowerReceiver.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/clients/android/uploader/test/.classpath b/clients/android/test/.classpath
similarity index 100%
rename from clients/android/uploader/test/.classpath
rename to clients/android/test/.classpath
diff --git a/clients/android/uploader/test/.project b/clients/android/test/.project
similarity index 100%
rename from clients/android/uploader/test/.project
rename to clients/android/test/.project
diff --git a/clients/android/uploader/test/AndroidManifest.xml b/clients/android/test/AndroidManifest.xml
similarity index 66%
rename from clients/android/uploader/test/AndroidManifest.xml
rename to clients/android/test/AndroidManifest.xml
index 11f303877..a41e59d9c 100644
--- a/clients/android/uploader/test/AndroidManifest.xml
+++ b/clients/android/test/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.danga.camli.test"
+      package="org.camlistore.test"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -8,5 +8,5 @@
     <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:targetPackage="com.danga.camli" android:name="android.test.InstrumentationTestRunner" />
-</manifest> 
\ No newline at end of file
+    <instrumentation android:targetPackage="org.camlistore" android:name="android.test.InstrumentationTestRunner" />
+</manifest> 
diff --git a/clients/android/uploader/test/build.properties b/clients/android/test/build.properties
similarity index 100%
rename from clients/android/uploader/test/build.properties
rename to clients/android/test/build.properties
diff --git a/clients/android/uploader/test/build.xml b/clients/android/test/build.xml
similarity index 100%
rename from clients/android/uploader/test/build.xml
rename to clients/android/test/build.xml
diff --git a/clients/android/uploader/test/default.properties b/clients/android/test/default.properties
similarity index 100%
rename from clients/android/uploader/test/default.properties
rename to clients/android/test/default.properties
diff --git a/clients/android/uploader/test/res/drawable-hdpi/icon.png b/clients/android/test/res/drawable-hdpi/icon.png
similarity index 100%
rename from clients/android/uploader/test/res/drawable-hdpi/icon.png
rename to clients/android/test/res/drawable-hdpi/icon.png
diff --git a/clients/android/uploader/test/res/drawable-ldpi/icon.png b/clients/android/test/res/drawable-ldpi/icon.png
similarity index 100%
rename from clients/android/uploader/test/res/drawable-ldpi/icon.png
rename to clients/android/test/res/drawable-ldpi/icon.png
diff --git a/clients/android/uploader/test/res/drawable-mdpi/icon.png b/clients/android/test/res/drawable-mdpi/icon.png
similarity index 100%
rename from clients/android/uploader/test/res/drawable-mdpi/icon.png
rename to clients/android/test/res/drawable-mdpi/icon.png
diff --git a/clients/android/uploader/test/res/layout/main.xml b/clients/android/test/res/layout/main.xml
similarity index 100%
rename from clients/android/uploader/test/res/layout/main.xml
rename to clients/android/test/res/layout/main.xml
diff --git a/clients/android/uploader/test/res/values/strings.xml b/clients/android/test/res/values/strings.xml
similarity index 100%
rename from clients/android/uploader/test/res/values/strings.xml
rename to clients/android/test/res/values/strings.xml
diff --git a/clients/android/uploader/test/src/com/danga/camli/CamliActivityTest.java b/clients/android/test/src/org/camlistore/CamliActivityTest.java
similarity index 97%
rename from clients/android/uploader/test/src/com/danga/camli/CamliActivityTest.java
rename to clients/android/test/src/org/camlistore/CamliActivityTest.java
index c50aa4925..14f726694 100644
--- a/clients/android/uploader/test/src/com/danga/camli/CamliActivityTest.java
+++ b/clients/android/test/src/org/camlistore/CamliActivityTest.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.test.ActivityInstrumentationTestCase2;