diff --git a/android/uploader/.gitignore b/clients/android/uploader/.gitignore
similarity index 100%
rename from android/uploader/.gitignore
rename to clients/android/uploader/.gitignore
diff --git a/android/uploader/AndroidManifest.xml b/clients/android/uploader/AndroidManifest.xml
similarity index 100%
rename from android/uploader/AndroidManifest.xml
rename to clients/android/uploader/AndroidManifest.xml
diff --git a/android/uploader/build.properties b/clients/android/uploader/build.properties
similarity index 100%
rename from android/uploader/build.properties
rename to clients/android/uploader/build.properties
diff --git a/android/uploader/build.xml b/clients/android/uploader/build.xml
similarity index 100%
rename from android/uploader/build.xml
rename to clients/android/uploader/build.xml
diff --git a/android/uploader/default.properties b/clients/android/uploader/default.properties
similarity index 100%
rename from android/uploader/default.properties
rename to clients/android/uploader/default.properties
diff --git a/android/uploader/res/layout/main.xml b/clients/android/uploader/res/layout/main.xml
similarity index 100%
rename from android/uploader/res/layout/main.xml
rename to clients/android/uploader/res/layout/main.xml
diff --git a/android/uploader/res/values/strings.xml b/clients/android/uploader/res/values/strings.xml
similarity index 100%
rename from android/uploader/res/values/strings.xml
rename to clients/android/uploader/res/values/strings.xml
diff --git a/android/uploader/src/com/danga/camlistore/uploader/ConfigActivity.java b/clients/android/uploader/src/com/danga/camlistore/uploader/ConfigActivity.java
similarity index 100%
rename from android/uploader/src/com/danga/camlistore/uploader/ConfigActivity.java
rename to clients/android/uploader/src/com/danga/camlistore/uploader/ConfigActivity.java