diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index 02cfcf6e3..a9b6f8d82 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -39,7 +39,7 @@
             android:theme="@style/NoTitle" >
         </activity>
         <activity
-            android:name=".ShareActivity"
+            android:name=".upload.ShareActivity"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             >
@@ -53,7 +53,7 @@
             </intent-filter>
         </activity>
         <activity
-                android:name=".MultipleShareActivity"
+                android:name=".upload.MultipleShareActivity"
                 android:icon="@drawable/ic_launcher"
                 android:label="@string/app_name"
                 >
@@ -82,7 +82,7 @@
             android:label="@string/title_activity_settings"
             />
         <activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
-        <service android:name="UploadService" >
+        <service android:name=".upload.UploadService" >
         </service>
         <service
             android:name=".auth.WikiAccountAuthenticatorService"
diff --git a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java b/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
new file mode 100644
index 000000000..f626b2e19
--- /dev/null
+++ b/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
@@ -0,0 +1,8 @@
+package org.wikimedia.commons.api;
+
+import com.android.volley.RequestQueue;
+
+public class MWApi {
+    private RequestQueue queue;
+
+}
diff --git a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java b/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
rename to commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
index 76887f4de..5898db4b5 100644
--- a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.category;
 
 import android.app.Activity;
 import android.content.ContentProviderClient;
@@ -17,6 +17,9 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
 import org.wikimedia.commons.category.Category;
 import org.wikimedia.commons.category.CategoryContentProvider;
 import org.wikimedia.commons.contributions.Contribution;
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
index a77689ba9..0a9574960 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
@@ -17,6 +17,7 @@ import com.actionbarsherlock.view.MenuItem;
 import org.wikimedia.commons.*;
 import org.wikimedia.commons.auth.*;
 import org.wikimedia.commons.media.*;
+import org.wikimedia.commons.upload.UploadService;
 
 public  class       ContributionsActivity
         extends     AuthenticatedActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
index 53721523b..e8caa90b2 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
@@ -32,6 +32,8 @@ import java.util.*;
 import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
 import org.wikimedia.commons.*;
 import org.wikimedia.commons.R;
+import org.wikimedia.commons.upload.ShareActivity;
+import org.wikimedia.commons.upload.UploadService;
 
 public class ContributionsListFragment extends SherlockFragment {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java b/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java
rename to commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
index 6093ebacf..62b37482d 100644
--- a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.upload;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -12,10 +12,11 @@ import android.text.*;
 import android.view.*;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
-import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
+import org.wikimedia.commons.*;
 import org.wikimedia.commons.auth.*;
+import org.wikimedia.commons.category.CategorizationFragment;
 import org.wikimedia.commons.contributions.*;
 import org.wikimedia.commons.media.*;
 import org.wikimedia.commons.modifications.CategoryModifier;
@@ -29,7 +30,7 @@ public  class       MultipleShareActivity
                     AdapterView.OnItemClickListener,
                     FragmentManager.OnBackStackChangedListener,
                     MultipleUploadListFragment.OnMultipleUploadInitiatedHandler,
-                    CategorizationFragment.OnCategoriesSaveHandler {
+        CategorizationFragment.OnCategoriesSaveHandler {
     private CommonsApplication app;
     private ArrayList<Contribution> photosList = null;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java b/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java
rename to commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
index fd064f279..0a54087b2 100644
--- a/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.upload;
 
 import android.content.*;
 import android.graphics.*;
@@ -14,6 +14,8 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.nostra13.universalimageloader.core.*;
 
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
 import org.wikimedia.commons.contributions.*;
 import org.wikimedia.commons.media.*;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/ShareActivity.java b/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/ShareActivity.java
rename to commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
index fcfa63f16..0fc955a4c 100644
--- a/commons/src/main/java/org/wikimedia/commons/ShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
@@ -1,18 +1,16 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.upload;
 
 import android.app.*;
 import android.content.*;
 import android.os.*;
-import android.text.*;
-import android.util.Log;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import android.net.*;
 import android.support.v4.app.NavUtils;
-import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import android.widget.*;
-import android.view.*;
 
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.category.CategorizationFragment;
 import org.wikimedia.commons.contributions.*;
 import org.wikimedia.commons.auth.*;
 import org.wikimedia.commons.modifications.CategoryModifier;
@@ -26,7 +24,7 @@ import java.util.ArrayList;
 public  class       ShareActivity
         extends     AuthenticatedActivity
         implements  SingleUploadFragment.OnUploadActionInitiated,
-                    CategorizationFragment.OnCategoriesSaveHandler {
+        CategorizationFragment.OnCategoriesSaveHandler {
 
     private SingleUploadFragment shareView;
     private CategorizationFragment categorizationFragment;
diff --git a/commons/src/main/java/org/wikimedia/commons/SingleUploadFragment.java b/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/SingleUploadFragment.java
rename to commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
index cdd485577..73cea614a 100644
--- a/commons/src/main/java/org/wikimedia/commons/SingleUploadFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.upload;
 
 import android.app.Activity;
 import android.content.Context;
@@ -21,6 +21,9 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import org.wikimedia.commons.Prefs;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
 import org.wikimedia.commons.contributions.Contribution;
 
 public class SingleUploadFragment extends SherlockFragment {
diff --git a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java b/commons/src/main/java/org/wikimedia/commons/upload/StartUploadTask.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
rename to commons/src/main/java/org/wikimedia/commons/upload/StartUploadTask.java
index b39d0fc2a..113eec975 100644
--- a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/StartUploadTask.java
@@ -1,7 +1,6 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.upload;
 
 import android.app.*;
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.*;
@@ -14,6 +13,9 @@ import android.webkit.MimeTypeMap;
 import java.io.*;
 import java.util.*;
 
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.Prefs;
+import org.wikimedia.commons.Utils;
 import org.wikimedia.commons.contributions.*;
 
 public class StartUploadTask extends AsyncTask<Void, Void, Contribution> {
diff --git a/commons/src/main/java/org/wikimedia/commons/UploadService.java b/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/UploadService.java
rename to commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
index 40794a24f..ecb457c79 100644
--- a/commons/src/main/java/org/wikimedia/commons/UploadService.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package org.wikimedia.commons.upload;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
 
 import android.graphics.*;
 import android.os.Bundle;
+import android.util.EventLog;
 import org.mediawiki.api.*;
 import in.yuvi.http.fluent.ProgressListener;
 
@@ -17,6 +18,7 @@ import android.support.v4.app.NotificationCompat;
 import android.util.*;
 import android.widget.*;
 
+import org.wikimedia.commons.*;
 import org.wikimedia.commons.contributions.*;
 import org.wikimedia.commons.modifications.ModificationsContentProvider;
 
@@ -220,7 +222,7 @@ public class UploadService extends HandlerService<Contribution> {
             if(!resultStatus.equals("Success")) {
                 String errorCode = result.getString("/api/error/@code");
                 showFailedNotification(contribution);
-                EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
+                org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource())
                         .param("multiple", contribution.getMultiple())
@@ -238,7 +240,7 @@ public class UploadService extends HandlerService<Contribution> {
                 contribution.setDateUploaded(dateUploaded);
                 contribution.save();
 
-                EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
+                org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource()) //FIXME
                         .param("filename", contribution.getFilename())