From 43a25121043d7d7c03d096bd4d42ff344e0ffe81 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sun, 4 Oct 2015 17:10:46 +1300
Subject: [PATCH] Fixed namespace issue

Packages are now all in org.wikimedia.commons
---
 commons/AndroidManifest.xml                   | 44 +++++++++----------
 commons/res/layout/activity_contributions.xml |  2 +-
 commons/res/layout/detail_category_item.xml   |  2 +-
 commons/res/layout/fragment_media_detail.xml  | 10 ++---
 commons/res/layout/layout_contribution.xml    |  4 +-
 commons/res/xml/authenticator.xml             |  2 +-
 commons/res/xml/campaigns_sync_adapter.xml    |  4 +-
 .../res/xml/contributions_sync_adapter.xml    |  4 +-
 .../res/xml/modifications_sync_adapter.xml    |  4 +-
 .../org/wikimedia/commons/AboutActivity.java  |  3 +-
 .../wikimedia/commons/CommonsApplication.java | 13 ++----
 .../java/org/wikimedia/commons/EventLog.java  |  3 +-
 .../org/wikimedia/commons/HandlerService.java |  2 +-
 .../java/org/wikimedia/commons/License.java   |  2 +-
 .../org/wikimedia/commons/LicenseList.java    |  4 +-
 .../java/org/wikimedia/commons/Media.java     |  3 +-
 .../wikimedia/commons/MediaDataExtractor.java |  2 +-
 .../wikimedia/commons/MediaWikiImageView.java |  7 ++-
 .../java/org/wikimedia/commons/Prefs.java     |  4 +-
 .../wikimedia/commons/SettingsActivity.java   |  2 +-
 .../java/org/wikimedia/commons/Utils.java     |  4 +-
 .../wikimedia/commons/WelcomeActivity.java    |  2 +-
 .../java/org/wikimedia/commons/api/MWApi.java |  2 +-
 .../commons/auth/AuthenticatedActivity.java   |  4 +-
 .../wikimedia/commons/auth/LoginActivity.java | 14 +++---
 .../auth/WikiAccountAuthenticator.java        |  6 +--
 .../auth/WikiAccountAuthenticatorService.java |  2 +-
 .../wikimedia/commons/campaigns/Campaign.java |  2 +-
 .../commons/campaigns/CampaignActivity.java   |  9 ++--
 .../campaigns/CampaignContribution.java       |  4 +-
 .../campaigns/CampaignsContentProvider.java   |  8 ++--
 .../campaigns/CampaignsListAdapter.java       | 13 +-----
 .../campaigns/CampaignsSyncAdapter.java       |  9 +---
 .../campaigns/CampaignsSyncService.java       |  3 +-
 .../category/CategorizationFragment.java      | 14 ++----
 .../wikimedia/commons/category/Category.java  |  6 +--
 .../category/CategoryContentProvider.java     |  8 ++--
 .../commons/contributions/Contribution.java   |  4 +-
 .../contributions/ContributionController.java |  8 ++--
 .../contributions/ContributionViewHolder.java |  7 ++-
 .../contributions/ContributionsActivity.java  | 12 ++---
 .../ContributionsContentProvider.java         |  8 ++--
 .../ContributionsListAdapter.java             | 12 +++--
 .../ContributionsListFragment.java            |  9 ++--
 .../ContributionsSyncAdapter.java             |  6 +--
 .../ContributionsSyncService.java             |  2 +-
 .../contributions/MediaListAdapter.java       |  9 ++--
 .../wikimedia/commons/data/DBOpenHelper.java  | 10 ++---
 .../commons/media/CategoryImagesLoader.java   |  8 ++--
 .../commons/media/MediaDetailFragment.java    |  4 +-
 .../media/MediaDetailPagerFragment.java       |  9 ++--
 .../commons/media/MediaDetailSpacer.java      |  2 +-
 .../modifications/CategoryModifier.java       |  7 +--
 .../ModificationsContentProvider.java         |  8 ++--
 .../ModificationsSyncAdapter.java             | 12 +++--
 .../ModificationsSyncService.java             |  2 +-
 .../modifications/ModifierSequence.java       |  6 +--
 .../commons/modifications/PageModifier.java   |  3 +-
 .../modifications/TemplateRemoveModifier.java |  2 +-
 .../commons/upload/MultipleShareActivity.java | 22 +++++-----
 .../upload/MultipleUploadListFragment.java    | 10 ++---
 .../commons/upload/ShareActivity.java         | 21 +++++----
 .../commons/upload/SingleUploadFragment.java  | 10 ++---
 .../commons/upload/UploadController.java      | 18 ++++----
 .../commons/upload/UploadService.java         | 15 +++----
 disable-campaigns.patch                       |  2 +-
 66 files changed, 207 insertions(+), 272 deletions(-)

diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index 43d65a51b..fd20f5bee 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="fr.free.nrw.commons"
+    package="org.wikimedia.commons"
     android:versionCode="17"
     android:versionName="1.2" >
 
@@ -31,15 +31,15 @@
                   android:finishOnTaskLaunch="true" />
 
         <activity
-            android:name=".auth.LoginActivity"
+            android:name="org.wikimedia.commons.auth.LoginActivity"
             android:theme="@style/NoTitle" >
         </activity>
         <activity
-            android:name=".WelcomeActivity"
+            android:name="org.wikimedia.commons.WelcomeActivity"
             android:theme="@style/NoTitle" >
         </activity>
         <activity
-            android:name=".upload.ShareActivity"
+            android:name="org.wikimedia.commons.upload.ShareActivity"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             >
@@ -53,7 +53,7 @@
             </intent-filter>
         </activity>
         <activity
-                android:name=".upload.MultipleShareActivity"
+                android:name="org.wikimedia.commons.upload.MultipleShareActivity"
                 android:icon="@drawable/ic_launcher"
                 android:label="@string/app_name"
                 >
@@ -68,7 +68,7 @@
         </activity>
 
         <activity
-                android:name=".contributions.ContributionsActivity"
+                android:name="org.wikimedia.commons.contributions.ContributionsActivity"
                 android:icon="@drawable/ic_launcher"
                 android:label="@string/app_name"
                  >
@@ -78,11 +78,11 @@
              </intent-filter>
         </activity>
         <activity
-            android:name=".SettingsActivity"
+            android:name="org.wikimedia.commons.SettingsActivity"
             android:label="@string/title_activity_settings"
             />
-        <activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
-        <activity android:name=".campaigns.CampaignActivity" android:label="Campaigns"
+        <activity android:name="org.wikimedia.commons.AboutActivity" android:label="@string/title_activity_about"/>
+        <activity android:name="org.wikimedia.commons.campaigns.CampaignActivity" android:label="Campaigns"
                 android:icon="@drawable/ic_launcher"
                 >
             <intent-filter>
@@ -91,10 +91,10 @@
             </intent-filter>
         </activity>
 
-        <service android:name=".upload.UploadService" >
+        <service android:name="org.wikimedia.commons.upload.UploadService" >
         </service>
         <service
-            android:name=".auth.WikiAccountAuthenticatorService"
+            android:name="org.wikimedia.commons.auth.WikiAccountAuthenticatorService"
             android:exported="true"
             android:process=":auth" >
             <intent-filter>
@@ -106,7 +106,7 @@
                 android:resource="@xml/authenticator" />
         </service>
         <service
-                android:name=".campaigns.CampaignsSyncService"
+                android:name="org.wikimedia.commons.campaigns.CampaignsSyncService"
                 android:exported="true">
             <intent-filter>
                 <action
@@ -117,7 +117,7 @@
                     android:resource="@xml/campaigns_sync_adapter" />
         </service>
         <service
-                android:name=".contributions.ContributionsSyncService"
+                android:name="org.wikimedia.commons.contributions.ContributionsSyncService"
                 android:exported="true">
             <intent-filter>
                 <action
@@ -129,7 +129,7 @@
         </service>
 
         <service
-                android:name=".modifications.ModificationsSyncService"
+                android:name="org.wikimedia.commons.modifications.ModificationsSyncService"
                 android:exported="true">
             <intent-filter>
                 <action
@@ -141,31 +141,31 @@
         </service>
 
         <provider
-                android:name=".contributions.ContributionsContentProvider"
+                android:name="org.wikimedia.commons.contributions.ContributionsContentProvider"
                 android:label="@string/provider_contributions"
                 android:syncable="true"
-                android:authorities="fr.free.nrw.commons.contributions.contentprovider"
+                android:authorities="org.wikimedia.commons.contributions.contentprovider"
                 android:exported="false">
         </provider>
         <provider
-                android:name=".campaigns.CampaignsContentProvider"
+                android:name="org.wikimedia.commons.campaigns.CampaignsContentProvider"
                 android:label="@string/provider_campaigns"
                 android:syncable="true"
-                android:authorities="fr.free.nrw.commons.campaigns.contentprovider"
+                android:authorities="org.wikimedia.commons.campaigns.contentprovider"
                 android:exported="false">
         </provider>
         <provider
-                android:name=".modifications.ModificationsContentProvider"
+                android:name="org.wikimedia.commons.modifications.ModificationsContentProvider"
                 android:label="@string/provider_modifications"
                 android:syncable="true"
-                android:authorities="fr.free.nrw.commons.modifications.contentprovider"
+                android:authorities="org.wikimedia.commons.modifications.contentprovider"
                 android:exported="false">
         </provider>
         <provider
-                android:name=".category.CategoryContentProvider"
+                android:name="org.wikimedia.commons.category.CategoryContentProvider"
                 android:label="@string/provider_categories"
                 android:syncable="false"
-                android:authorities="fr.free.nrw.commons.categories.contentprovider"
+                android:authorities="org.wikimedia.commons.categories.contentprovider"
                 android:exported="false">
         </provider>
     </application>
diff --git a/commons/res/layout/activity_contributions.xml b/commons/res/layout/activity_contributions.xml
index 1e407ee9e..e1aba9b0a 100644
--- a/commons/res/layout/activity_contributions.xml
+++ b/commons/res/layout/activity_contributions.xml
@@ -8,7 +8,7 @@
               android:background="#000000"
         >
     <fragment
-        android:name="fr.free.nrw.commons.contributions.ContributionsListFragment"
+        android:name="org.wikimedia.commons.contributions.ContributionsListFragment"
         android:id="@+id/contributionsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/commons/res/layout/detail_category_item.xml b/commons/res/layout/detail_category_item.xml
index 9e2e2fc45..0c1e47a90 100644
--- a/commons/res/layout/detail_category_item.xml
+++ b/commons/res/layout/detail_category_item.xml
@@ -16,7 +16,7 @@
             android:textColor="@android:color/white"
             android:background="#20ffffff"
             />
-    <fr.free.nrw.commons.media.MediaDetailSpacer
+    <org.wikimedia.commons.media.MediaDetailSpacer
             android:layout_width="fill_parent"
             android:layout_height="8dp"/>
 </LinearLayout>
diff --git a/commons/res/layout/fragment_media_detail.xml b/commons/res/layout/fragment_media_detail.xml
index 06c22151c..0ca84aa2f 100644
--- a/commons/res/layout/fragment_media_detail.xml
+++ b/commons/res/layout/fragment_media_detail.xml
@@ -22,7 +22,7 @@
                android:visibility="gone"
                />
 
-    <fr.free.nrw.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
+    <org.wikimedia.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
                android:layout_width="fill_parent"
                android:layout_height="fill_parent"
                android:scaleType="fitCenter"
@@ -42,7 +42,7 @@
 
             <!-- Placeholder. Height gets set at runtime based on container size; the initial value is a hack to keep
                  the detail info offscreen until it's placed properly. May be a better way to do this. -->
-            <fr.free.nrw.commons.media.MediaDetailSpacer
+            <org.wikimedia.commons.media.MediaDetailSpacer
                     android:layout_width="fill_parent"
                     android:layout_height="16dp"
                     android:id="@+id/mediaDetailSpacer"/>
@@ -77,7 +77,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <fr.free.nrw.commons.media.MediaDetailSpacer
+                <org.wikimedia.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
@@ -105,7 +105,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <fr.free.nrw.commons.media.MediaDetailSpacer
+                <org.wikimedia.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
@@ -133,7 +133,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <fr.free.nrw.commons.media.MediaDetailSpacer
+                <org.wikimedia.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
diff --git a/commons/res/layout/layout_contribution.xml b/commons/res/layout/layout_contribution.xml
index 181e3862f..fdfe42f35 100644
--- a/commons/res/layout/layout_contribution.xml
+++ b/commons/res/layout/layout_contribution.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:custom="http://schemas.android.com/apk/res/fr.free.nrw.commons"
+             xmlns:custom="http://schemas.android.com/apk/res/org.wikimedia.commons"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
               android:typeface="serif"
               android:layout_gravity="end|bottom"
             />
-    <fr.free.nrw.commons.MediaWikiImageView android:id="@+id/contributionImage"
+    <org.wikimedia.commons.MediaWikiImageView android:id="@+id/contributionImage"
                android:layout_width="fill_parent"
                android:layout_height="240dp"
                android:scaleType="centerCrop"
diff --git a/commons/res/xml/authenticator.xml b/commons/res/xml/authenticator.xml
index 17b9b34d3..7a25b8777 100644
--- a/commons/res/xml/authenticator.xml
+++ b/commons/res/xml/authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="fr.free.nrw.commons"
+    android:accountType="org.wikimedia.commons"
     android:icon="@drawable/ic_launcher"
     android:label="@string/app_name"
     android:smallIcon="@drawable/ic_launcher" />
diff --git a/commons/res/xml/campaigns_sync_adapter.xml b/commons/res/xml/campaigns_sync_adapter.xml
index 1da828c50..778984c07 100644
--- a/commons/res/xml/campaigns_sync_adapter.xml
+++ b/commons/res/xml/campaigns_sync_adapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.free.nrw.commons.campaigns.contentprovider"
-              android:accountType="fr.free.nrw.commons"
+              android:contentAuthority="org.wikimedia.commons.campaigns.contentprovider"
+              android:accountType="org.wikimedia.commons"
               android:supportsUploading="false"
               android:userVisible="true"
               android:isAlwaysSyncable="true"
diff --git a/commons/res/xml/contributions_sync_adapter.xml b/commons/res/xml/contributions_sync_adapter.xml
index 68944e822..a663c655d 100644
--- a/commons/res/xml/contributions_sync_adapter.xml
+++ b/commons/res/xml/contributions_sync_adapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.free.nrw.commons.contributions.contentprovider"
-              android:accountType="fr.free.nrw.commons"
+              android:contentAuthority="org.wikimedia.commons.contributions.contentprovider"
+              android:accountType="org.wikimedia.commons"
               android:supportsUploading="false"
               android:userVisible="true"
               android:isAlwaysSyncable="true"
diff --git a/commons/res/xml/modifications_sync_adapter.xml b/commons/res/xml/modifications_sync_adapter.xml
index d7d97ff89..e85d9a6d4 100644
--- a/commons/res/xml/modifications_sync_adapter.xml
+++ b/commons/res/xml/modifications_sync_adapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.free.nrw.commons.modifications.contentprovider"
-              android:accountType="fr.free.nrw.commons"
+              android:contentAuthority="org.wikimedia.commons.modifications.contentprovider"
+              android:accountType="org.wikimedia.commons"
               android:supportsUploading="true"
               android:userVisible="true"
               android:isAlwaysSyncable="true"
diff --git a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java b/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
index bdaf4b12e..a022e5e12 100644
--- a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
@@ -1,6 +1,5 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
index 65773886e..81e86e89b 100644
--- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
+++ b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
@@ -1,41 +1,34 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.URI;
 
 import android.accounts.*;
 import android.app.Application;
-import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Build;
 
 import android.support.v4.util.LruCache;
 import android.util.Log;
 import com.android.volley.RequestQueue;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
-import com.nostra13.universalimageloader.cache.memory.impl.LimitedAgeMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.utils.StorageUtils;
 import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
-import org.apache.http.client.HttpClient;
 import org.apache.http.conn.*;
 import org.apache.http.conn.scheme.*;
 import org.apache.http.conn.ssl.*;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.BasicHttpParams;
 import org.mediawiki.api.*;
-import fr.free.nrw.commons.auth.WikiAccountAuthenticator;
+import org.wikimedia.commons.auth.WikiAccountAuthenticator;
 import org.apache.http.impl.client.*;
 import org.apache.http.params.CoreProtocolPNames;
-import fr.free.nrw.commons.data.*;
+import org.wikimedia.commons.data.*;
 
 import com.android.volley.toolbox.*;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/EventLog.java b/commons/src/main/java/org/wikimedia/commons/EventLog.java
index 698171245..55e371fb6 100644
--- a/commons/src/main/java/org/wikimedia/commons/EventLog.java
+++ b/commons/src/main/java/org/wikimedia/commons/EventLog.java
@@ -1,6 +1,5 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.*;
 import android.preference.PreferenceManager;
diff --git a/commons/src/main/java/org/wikimedia/commons/HandlerService.java b/commons/src/main/java/org/wikimedia/commons/HandlerService.java
index f2e30ffec..3b15a7474 100644
--- a/commons/src/main/java/org/wikimedia/commons/HandlerService.java
+++ b/commons/src/main/java/org/wikimedia/commons/HandlerService.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/License.java b/commons/src/main/java/org/wikimedia/commons/License.java
index d7b5c28e2..caa9bc4d6 100644
--- a/commons/src/main/java/org/wikimedia/commons/License.java
+++ b/commons/src/main/java/org/wikimedia/commons/License.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 public class License {
     String key;
diff --git a/commons/src/main/java/org/wikimedia/commons/LicenseList.java b/commons/src/main/java/org/wikimedia/commons/LicenseList.java
index deaf31c30..b9da572b2 100644
--- a/commons/src/main/java/org/wikimedia/commons/LicenseList.java
+++ b/commons/src/main/java/org/wikimedia/commons/LicenseList.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -59,7 +59,7 @@ public class LicenseList {
     }
 
     private int stringIdByName(String stringId) {
-        return res.getIdentifier("fr.free.nrw.commons:string/" + stringId, null, null);
+        return res.getIdentifier("org.wikimedia.commons:string/" + stringId, null, null);
     }
 
     public String nameForTemplate(String template) {
diff --git a/commons/src/main/java/org/wikimedia/commons/Media.java b/commons/src/main/java/org/wikimedia/commons/Media.java
index 85d10d2fa..0ce9e64f7 100644
--- a/commons/src/main/java/org/wikimedia/commons/Media.java
+++ b/commons/src/main/java/org/wikimedia/commons/Media.java
@@ -1,8 +1,7 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.net.Uri;
 import android.os.*;
-import android.util.Log;
 
 import java.util.*;
 import java.util.regex.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java b/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
index 2e8a17094..f6cc7d331 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
+++ b/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.util.Log;
 import org.mediawiki.api.ApiResult;
diff --git a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
index f998c5834..6d779da89 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
+++ b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.BitmapDrawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -28,8 +27,8 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.ImageLoader.ImageContainer;
 import com.android.volley.toolbox.ImageLoader.ImageListener;
-import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
+import org.wikimedia.commons.contributions.Contribution;
+import org.wikimedia.commons.contributions.ContributionsContentProvider;
 
 
 public class MediaWikiImageView extends ImageView {
diff --git a/commons/src/main/java/org/wikimedia/commons/Prefs.java b/commons/src/main/java/org/wikimedia/commons/Prefs.java
index dc591d980..b59dce641 100644
--- a/commons/src/main/java/org/wikimedia/commons/Prefs.java
+++ b/commons/src/main/java/org/wikimedia/commons/Prefs.java
@@ -1,7 +1,7 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 public class Prefs {
-    public static String GLOBAL_PREFS = "fr.free.nrw.commons.preferences";
+    public static String GLOBAL_PREFS = "org.wikimedia.commons.preferences";
 
     public static String TRACKING_ENABLED = "eventLogging";
     public static final String DEFAULT_LICENSE = "defaultLicense";
diff --git a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
index ee71d2f2c..693fe4331 100644
--- a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 
 import android.content.SharedPreferences;
diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/org/wikimedia/commons/Utils.java
index 9a2ba7c9b..f7645aa26 100644
--- a/commons/src/main/java/org/wikimedia/commons/Utils.java
+++ b/commons/src/main/java/org/wikimedia/commons/Utils.java
@@ -1,8 +1,7 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.net.Uri;
 import android.os.*;
-import android.util.Log;
 import com.nostra13.universalimageloader.core.*;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
@@ -19,7 +18,6 @@ import java.io.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.Executor;
-import java.util.regex.Pattern;
 
 public class Utils {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java b/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
index da05dfd08..62c956334 100644
--- a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons;
+package org.wikimedia.commons;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java b/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
index c2d6d99f9..f626b2e19 100644
--- a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
+++ b/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.api;
+package org.wikimedia.commons.api;
 
 import com.android.volley.RequestQueue;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java b/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
index a855b187f..4051a77e0 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.auth;
+package org.wikimedia.commons.auth;
 
 import java.io.IOException;
 
@@ -8,7 +8,7 @@ import com.actionbarsherlock.app.*;
 import android.accounts.*;
 import android.os.*;
 
-import fr.free.nrw.commons.*;
+import org.wikimedia.commons.*;
 
 public class AuthenticatedActivity extends SherlockFragmentActivity {
     
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java b/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
index 8a3c16b89..573c0dfe9 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.auth;
+package org.wikimedia.commons.auth;
 
 import java.io.IOException;
 
@@ -14,16 +14,16 @@ import android.view.*;
 import android.widget.*;
 import android.support.v4.app.NavUtils;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.EventLog;
-import fr.free.nrw.commons.campaigns.CampaignsContentProvider;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.EventLog;
+import org.wikimedia.commons.campaigns.CampaignsContentProvider;
+import org.wikimedia.commons.contributions.*;
+import org.wikimedia.commons.modifications.ModificationsContentProvider;
 
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
-    public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username";
+    public static final String PARAM_USERNAME = "org.wikimedia.commons.login.username";
 
     private CommonsApplication app;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
index d41155619..fe8ae8c71 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.auth;
+package org.wikimedia.commons.auth;
 
 import java.io.IOException;
 
@@ -7,11 +7,11 @@ import android.content.*;
 import android.os.*;
 
 import org.mediawiki.api.*;
-import fr.free.nrw.commons.*;
+import org.wikimedia.commons.*;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
 
-    public static final String COMMONS_ACCOUNT_TYPE = "fr.free.nrw.commons";
+    public static final String COMMONS_ACCOUNT_TYPE = "org.wikimedia.commons";
     private Context context;
     public WikiAccountAuthenticator(Context context) {
         super(context);
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
index 89521c609..1f8bc17dd 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.auth;
+package org.wikimedia.commons.auth;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java b/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
index dfbf5f96a..61b796eab 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
index 3e3a44dbc..22ef9af59 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
@@ -1,6 +1,5 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
@@ -12,9 +11,9 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.ContributionsActivity;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.contributions.ContributionsActivity;
 
 public  class CampaignActivity
         extends SherlockFragmentActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
index 4cd0f77a9..c9a8045a9 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
@@ -1,7 +1,7 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
 import android.net.Uri;
-import fr.free.nrw.commons.contributions.Contribution;
+import org.wikimedia.commons.contributions.Contribution;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
index 5dba82941..80bd972bc 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -9,15 +9,15 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.data.DBOpenHelper;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.data.DBOpenHelper;
 
 public class CampaignsContentProvider extends ContentProvider{
 
     private static final int CAMPAIGNS = 1;
     private static final int CAMPAIGNS_ID = 2;
 
-    public static final String AUTHORITY = "fr.free.nrw.commons.campaigns.contentprovider";
+    public static final String AUTHORITY = "org.wikimedia.commons.campaigns.contentprovider";
     private static final String BASE_PATH = "campiagns";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
index ecb40f699..009e4d035 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
@@ -1,23 +1,14 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
 import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
 import android.support.v4.widget.CursorAdapter;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockFragment;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.MediaWikiImageView;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.campaigns.Campaign;
+import org.wikimedia.commons.Utils;
 
 class CampaignsListAdapter extends CursorAdapter {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
index 1b1096ff2..1a0606800 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
@@ -1,22 +1,17 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
 import android.accounts.Account;
 import android.content.*;
-import android.database.Cursor;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
+import org.wikimedia.commons.CommonsApplication;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 
 
 public class CampaignsSyncAdapter extends AbstractThreadedSyncAdapter {
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
index d8055e761..b7557351b 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
@@ -1,9 +1,8 @@
-package fr.free.nrw.commons.campaigns;
+package org.wikimedia.commons.campaigns;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
 
 public class CampaignsSyncService extends Service {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java b/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
index c53d893fc..cf70e9445 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.category;
+package org.wikimedia.commons.category;
 
 import android.app.Activity;
 import android.content.ContentProviderClient;
@@ -9,23 +9,17 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.*;
-import android.view.MenuInflater;
 import android.widget.*;
 import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.*;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.category.Category;
-import fr.free.nrw.commons.category.CategoryContentProvider;
-import fr.free.nrw.commons.contributions.Contribution;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/commons/src/main/java/org/wikimedia/commons/category/Category.java b/commons/src/main/java/org/wikimedia/commons/category/Category.java
index 1dd3e555e..08c379f4e 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/Category.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/Category.java
@@ -1,15 +1,11 @@
-package fr.free.nrw.commons.category;
+package org.wikimedia.commons.category;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
 import android.os.RemoteException;
-import android.text.TextUtils;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 import java.util.Date;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java b/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
index 0878b8f2e..fa1f86c36 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.category;
+package org.wikimedia.commons.category;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -9,8 +9,8 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.data.DBOpenHelper;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.data.DBOpenHelper;
 
 public class CategoryContentProvider extends ContentProvider {
 
@@ -18,7 +18,7 @@ public class CategoryContentProvider extends ContentProvider {
     private static final int CATEGORIES = 1;
     private static final int CATEGORIES_ID = 2;
 
-    public static final String AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
+    public static final String AUTHORITY = "org.wikimedia.commons.categories.contentprovider";
     private static final String BASE_PATH = "categories";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
index b5ec3d155..55d9e1cd0 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import java.text.*;
 import java.util.*;
@@ -10,7 +10,7 @@ import android.net.*;
 import android.os.*;
 import android.text.*;
 
-import fr.free.nrw.commons.*;
+import org.wikimedia.commons.*;
 
 public class Contribution extends Media {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
index 32777cdb6..ce2a730d8 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.app.*;
 import android.content.Intent;
@@ -8,9 +8,9 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.util.Log;
 import com.actionbarsherlock.app.SherlockFragment;
-import fr.free.nrw.commons.campaigns.Campaign;
-import fr.free.nrw.commons.upload.ShareActivity;
-import fr.free.nrw.commons.upload.UploadService;
+import org.wikimedia.commons.campaigns.Campaign;
+import org.wikimedia.commons.upload.ShareActivity;
+import org.wikimedia.commons.upload.UploadService;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
index 837a4360e..2f43e04dc 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
@@ -1,11 +1,10 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import fr.free.nrw.commons.MediaWikiImageView;
-import fr.free.nrw.commons.R;
+import org.wikimedia.commons.MediaWikiImageView;
+import org.wikimedia.commons.R;
 
 class ContributionViewHolder {
     final MediaWikiImageView imageView;
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 81cff5cbe..078e02ff7 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.database.DataSetObserver;
 import android.os.IBinder;
@@ -17,11 +17,11 @@ import android.widget.Adapter;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.auth.*;
-import fr.free.nrw.commons.campaigns.Campaign;
-import fr.free.nrw.commons.media.*;
-import fr.free.nrw.commons.upload.UploadService;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.auth.*;
+import org.wikimedia.commons.campaigns.Campaign;
+import org.wikimedia.commons.media.*;
+import org.wikimedia.commons.upload.UploadService;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
index b2657b835..c05edc1a7 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.content.*;
 import android.database.*;
@@ -7,15 +7,15 @@ import android.net.*;
 import android.text.*;
 import android.util.*;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.data.*;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.data.*;
 
 public class ContributionsContentProvider extends ContentProvider{
 
     private static final int CONTRIBUTIONS = 1;
     private static final int CONTRIBUTIONS_ID = 2;
 
-    public static final String AUTHORITY = "fr.free.nrw.commons.contributions.contentprovider";
+    public static final String AUTHORITY = "org.wikimedia.commons.contributions.contentprovider";
     private static final String BASE_PATH = "contributions";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
index 6397caab9..372ff98ab 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,17 +7,15 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.v4.widget.CursorAdapter;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import com.actionbarsherlock.app.SherlockFragment;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.MediaWikiImageView;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.MediaWikiImageView;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
 
 class ContributionsListAdapter extends CursorAdapter {
 
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 cbade3177..4de93fe89 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
@@ -1,10 +1,9 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.database.Cursor;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -17,9 +16,9 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.campaigns.Campaign;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.campaigns.Campaign;
 
 public class ContributionsListFragment extends SherlockFragment {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
index 1cf8bf976..aa7f37175 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.content.*;
 import android.database.Cursor;
@@ -12,8 +12,8 @@ import java.io.*;
 import java.util.*;
 
 import org.mediawiki.api.*;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.*;
+import org.wikimedia.commons.Utils;
+import org.wikimedia.commons.*;
 
 
 public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter {
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
index f599e4fd2..e99f557c0 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java b/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
index 7a365a12b..654e2bb13 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
@@ -1,13 +1,12 @@
-package fr.free.nrw.commons.contributions;
+package org.wikimedia.commons.contributions;
 
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import com.android.volley.toolbox.ImageLoader;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.R;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.Media;
+import org.wikimedia.commons.R;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java b/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
index e3b532f6f..a8560a9f5 100644
--- a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
+++ b/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
@@ -1,12 +1,12 @@
-package fr.free.nrw.commons.data;
+package org.wikimedia.commons.data;
 
 import android.content.*;
 import android.database.sqlite.*;
 
-import fr.free.nrw.commons.campaigns.Campaign;
-import fr.free.nrw.commons.category.Category;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.modifications.ModifierSequence;
+import org.wikimedia.commons.campaigns.Campaign;
+import org.wikimedia.commons.category.Category;
+import org.wikimedia.commons.contributions.*;
+import org.wikimedia.commons.modifications.ModifierSequence;
 
 public class DBOpenHelper  extends SQLiteOpenHelper{
 
diff --git a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java b/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
index 28e882ecd..02e517f35 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
@@ -1,12 +1,12 @@
-package fr.free.nrw.commons.media;
+package org.wikimedia.commons.media;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 import android.util.Log;
 import org.mediawiki.api.ApiResult;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.Utils;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.Media;
+import org.wikimedia.commons.Utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
index e7b608938..bbec31ec2 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.media;
+package org.wikimedia.commons.media;
 
 import android.content.Intent;
 import android.database.DataSetObserver;
@@ -16,7 +16,7 @@ import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 
 import com.android.volley.toolbox.*;
 
-import fr.free.nrw.commons.*;
+import org.wikimedia.commons.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
index c2d0813ef..e76e25efc 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.media;
+package org.wikimedia.commons.media;
 
 import android.app.DownloadManager;
 import android.content.*;
@@ -16,11 +16,10 @@ import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.widget.ShareActionProvider;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.contributions.ContributionsActivity;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.contributions.Contribution;
+import org.wikimedia.commons.contributions.ContributionsActivity;
 
 public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener {
     private ViewPager pager;
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
index cf89ad256..49b048535 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.media;
+package org.wikimedia.commons.media;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java b/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
index f4c59cf93..2c1a0e049 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
@@ -1,14 +1,9 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
-import android.os.Bundle;
-import android.os.Parcel;
-import android.text.TextUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.*;
-
 public class CategoryModifier extends PageModifier {
 
 
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
index 1bf4ae382..dc7beff75 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
 import android.content.*;
 import android.database.*;
@@ -7,15 +7,15 @@ import android.net.*;
 import android.text.*;
 import android.util.*;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.data.*;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.data.*;
 
 public class ModificationsContentProvider extends ContentProvider{
 
     private static final int MODIFICATIONS = 1;
     private static final int MODIFICATIONS_ID = 2;
 
-    public static final String AUTHORITY = "fr.free.nrw.commons.modifications.contentprovider";
+    public static final String AUTHORITY = "org.wikimedia.commons.modifications.contentprovider";
     private static final String BASE_PATH = "modifications";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
index 72b12ae00..8bfa4987b 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
@@ -6,19 +6,17 @@ import android.accounts.OperationCanceledException;
 import android.content.*;
 import android.database.Cursor;
 import android.os.RemoteException;
-import android.text.TextUtils;
 import android.util.Log;
 import android.accounts.Account;
 import android.os.Bundle;
 
 import java.io.*;
-import java.util.*;
 
 import org.mediawiki.api.*;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
+import org.wikimedia.commons.Utils;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.contributions.Contribution;
+import org.wikimedia.commons.contributions.ContributionsContentProvider;
 
 
 public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
index 7f424c362..86a80fa94 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
index 7c88ee225..c505fa4d9 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
@@ -6,15 +6,11 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.RemoteException;
-import android.text.TextUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 
 public class ModifierSequence {
     private Uri mediaUri;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java b/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
index d130570ff..98529ca52 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
@@ -1,6 +1,5 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
-import android.os.Bundle;
 import org.json.JSONException;
 import org.json.JSONObject;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java b/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
index 21b4872b7..25b37dab5 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.modifications;
+package org.wikimedia.commons.modifications;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java b/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
index 297759896..924079b26 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
@@ -1,7 +1,6 @@
-package fr.free.nrw.commons.upload;
+package org.wikimedia.commons.upload;
 
 import java.util.*;
-import java.util.concurrent.*;
 
 import android.app.*;
 import android.content.*;
@@ -9,21 +8,20 @@ import android.database.DataSetObserver;
 import android.net.*;
 import android.os.*;
 import android.support.v4.app.FragmentManager;
-import android.text.*;
 import android.view.*;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 import com.actionbarsherlock.view.MenuItem;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.auth.*;
-import fr.free.nrw.commons.category.CategorizationFragment;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.media.*;
-import fr.free.nrw.commons.modifications.CategoryModifier;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
-import fr.free.nrw.commons.modifications.ModifierSequence;
-import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
+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;
+import org.wikimedia.commons.modifications.ModificationsContentProvider;
+import org.wikimedia.commons.modifications.ModifierSequence;
+import org.wikimedia.commons.modifications.TemplateRemoveModifier;
 
 public  class       MultipleShareActivity
         extends     AuthenticatedActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java b/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
index 267a9642d..0a54087b2 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.upload;
+package org.wikimedia.commons.upload;
 
 import android.content.*;
 import android.graphics.*;
@@ -14,10 +14,10 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.nostra13.universalimageloader.core.*;
 
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.media.*;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
+import org.wikimedia.commons.contributions.*;
+import org.wikimedia.commons.media.*;
 
 
 public class MultipleUploadListFragment extends SherlockFragment {
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java b/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
index 399afaff3..64f5235eb 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
@@ -1,6 +1,5 @@
-package fr.free.nrw.commons.upload;
+package org.wikimedia.commons.upload;
 
-import android.app.*;
 import android.content.*;
 import android.os.*;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -9,15 +8,15 @@ import android.support.v4.app.NavUtils;
 import com.actionbarsherlock.view.MenuItem;
 import android.widget.*;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.campaigns.Campaign;
-import fr.free.nrw.commons.category.CategorizationFragment;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.auth.*;
-import fr.free.nrw.commons.modifications.CategoryModifier;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
-import fr.free.nrw.commons.modifications.ModifierSequence;
-import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.campaigns.Campaign;
+import org.wikimedia.commons.category.CategorizationFragment;
+import org.wikimedia.commons.contributions.*;
+import org.wikimedia.commons.auth.*;
+import org.wikimedia.commons.modifications.CategoryModifier;
+import org.wikimedia.commons.modifications.ModificationsContentProvider;
+import org.wikimedia.commons.modifications.ModifierSequence;
+import org.wikimedia.commons.modifications.TemplateRemoveModifier;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java b/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
index eb63ea5d4..adbc745c4 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.upload;
+package org.wikimedia.commons.upload;
 
 import android.app.Activity;
 import android.content.Context;
@@ -20,11 +20,9 @@ import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import fr.free.nrw.commons.Prefs;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.contributions.Contribution;
+import org.wikimedia.commons.Prefs;
+import org.wikimedia.commons.R;
+import org.wikimedia.commons.Utils;
 
 public class SingleUploadFragment extends SherlockFragment {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java b/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
index e218b0cac..f232eb4de 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.upload;
+package org.wikimedia.commons.upload;
 
 import android.app.Activity;
 import android.content.*;
@@ -10,18 +10,16 @@ import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.HandlerService;
-import fr.free.nrw.commons.Prefs;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.campaigns.Campaign;
-import fr.free.nrw.commons.campaigns.CampaignContribution;
-import fr.free.nrw.commons.contributions.Contribution;
+import org.wikimedia.commons.CommonsApplication;
+import org.wikimedia.commons.HandlerService;
+import org.wikimedia.commons.Prefs;
+import org.wikimedia.commons.Utils;
+import org.wikimedia.commons.campaigns.Campaign;
+import org.wikimedia.commons.campaigns.CampaignContribution;
+import org.wikimedia.commons.contributions.Contribution;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 
 public class UploadController {
     private UploadService uploadService;
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java b/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
index 2be1cc65f..69b0ee5fc 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.upload;
+package org.wikimedia.commons.upload;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -8,7 +8,6 @@ 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;
 
@@ -18,13 +17,13 @@ import android.support.v4.app.NotificationCompat;
 import android.util.*;
 import android.widget.*;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
+import org.wikimedia.commons.*;
+import org.wikimedia.commons.contributions.*;
+import org.wikimedia.commons.modifications.ModificationsContentProvider;
 
 public class UploadService extends HandlerService<Contribution> {
 
-    private static final String EXTRA_PREFIX = "fr.free.nrw.commons.upload";
+    private static final String EXTRA_PREFIX = "org.wikimedia.commons.upload";
 
     public static final int ACTION_UPLOAD_FILE = 1;
 
@@ -223,7 +222,7 @@ public class UploadService extends HandlerService<Contribution> {
             if(!resultStatus.equals("Success")) {
                 String errorCode = result.getString("/api/error/@code");
                 showFailedNotification(contribution);
-                fr.free.nrw.commons.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())
@@ -241,7 +240,7 @@ public class UploadService extends HandlerService<Contribution> {
                 contribution.setDateUploaded(dateUploaded);
                 contribution.save();
 
-                fr.free.nrw.commons.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())
diff --git a/disable-campaigns.patch b/disable-campaigns.patch
index a56ea52f8..1b06132b8 100644
--- a/disable-campaigns.patch
+++ b/disable-campaigns.patch
@@ -42,7 +42,7 @@ index 5ad1c77..50b16ff 100644
 -                android:name=".campaigns.CampaignsContentProvider"
 -                android:label="@string/provider_campaigns"
 -                android:syncable="true"
--                android:authorities="fr.free.nrw.commons.campaigns.contentprovider"
+-                android:authorities="org.wikimedia.commons.campaigns.contentprovider"
 -                android:exported="false">
 -        </provider>
 -        <provider