From 5765c99704e848cc0a878a4f0b0e63499c4be321 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sun, 4 Oct 2015 17:49:52 +1300
Subject: [PATCH] Changed folder names to be in line with package names

Fixes issue #15
---
 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 +-
 .../nrw}/commons/AboutActivity.java           |  2 +-
 .../nrw}/commons/CommonsApplication.java      |  6 +--
 .../nrw}/commons/EventLog.java                |  2 +-
 .../nrw}/commons/HandlerService.java          |  2 +-
 .../nrw}/commons/License.java                 |  2 +-
 .../nrw}/commons/LicenseList.java             |  4 +-
 .../wikimedia => free/nrw}/commons/Media.java |  2 +-
 .../nrw}/commons/MediaDataExtractor.java      |  2 +-
 .../nrw}/commons/MediaWikiImageView.java      |  6 +--
 .../wikimedia => free/nrw}/commons/Prefs.java |  4 +-
 .../nrw}/commons/SettingsActivity.java        |  4 +-
 .../wikimedia => free/nrw}/commons/Utils.java |  2 +-
 .../nrw}/commons/WelcomeActivity.java         |  3 +-
 .../nrw}/commons/api/MWApi.java               |  2 +-
 .../commons/auth/AuthenticatedActivity.java   |  5 ++-
 .../nrw}/commons/auth/LoginActivity.java      | 16 ++++---
 .../auth/WikiAccountAuthenticator.java        |  6 +--
 .../auth/WikiAccountAuthenticatorService.java |  2 +-
 .../nrw}/commons/campaigns/Campaign.java      |  2 +-
 .../commons/campaigns/CampaignActivity.java   |  8 ++--
 .../campaigns/CampaignContribution.java       |  4 +-
 .../campaigns/CampaignsContentProvider.java   |  8 ++--
 .../campaigns/CampaignsListAdapter.java       |  4 +-
 .../campaigns/CampaignsSyncAdapter.java       |  4 +-
 .../campaigns/CampaignsSyncService.java       |  2 +-
 .../category/CategorizationFragment.java      |  8 ++--
 .../nrw}/commons/category/Category.java       |  2 +-
 .../category/CategoryContentProvider.java     |  8 ++--
 .../commons/contributions/Contribution.java   |  4 +-
 .../contributions/ContributionController.java |  8 ++--
 .../contributions/ContributionViewHolder.java |  6 +--
 .../contributions/ContributionsActivity.java  | 15 ++++---
 .../ContributionsContentProvider.java         |  8 ++--
 .../ContributionsListAdapter.java             | 10 ++---
 .../ContributionsListFragment.java            | 10 +++--
 .../ContributionsSyncAdapter.java             |  6 +--
 .../ContributionsSyncService.java             |  2 +-
 .../contributions/MediaListAdapter.java       |  8 ++--
 .../nrw}/commons/data/DBOpenHelper.java       | 10 ++---
 .../commons/media/CategoryImagesLoader.java   |  8 ++--
 .../commons/media/MediaDetailFragment.java    |  4 +-
 .../media/MediaDetailPagerFragment.java       | 11 +++--
 .../nrw}/commons/media/MediaDetailSpacer.java |  2 +-
 .../modifications/CategoryModifier.java       |  2 +-
 .../ModificationsContentProvider.java         |  8 ++--
 .../ModificationsSyncAdapter.java             | 10 ++---
 .../ModificationsSyncService.java             |  2 +-
 .../modifications/ModifierSequence.java       |  2 +-
 .../commons/modifications/PageModifier.java   |  2 +-
 .../modifications/TemplateRemoveModifier.java |  2 +-
 .../commons/upload/MultipleShareActivity.java | 23 +++++-----
 .../upload/MultipleUploadListFragment.java    | 10 ++---
 .../nrw}/commons/upload/ShareActivity.java    | 22 +++++-----
 .../commons/upload/SingleUploadFragment.java  |  8 ++--
 .../nrw}/commons/upload/UploadController.java | 32 +++++++-------
 .../nrw}/commons/upload/UploadService.java    | 15 ++++---
 disable-campaigns.patch                       |  2 +-
 66 files changed, 233 insertions(+), 217 deletions(-)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/AboutActivity.java (98%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/CommonsApplication.java (98%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/EventLog.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/HandlerService.java (98%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/License.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/LicenseList.java (95%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/Media.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/MediaDataExtractor.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/MediaWikiImageView.java (98%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/Prefs.java (76%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/SettingsActivity.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/Utils.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/WelcomeActivity.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/api/MWApi.java (73%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/AuthenticatedActivity.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/LoginActivity.java (94%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/WikiAccountAuthenticator.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/WikiAccountAuthenticatorService.java (94%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/Campaign.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignActivity.java (92%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignContribution.java (94%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsContentProvider.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsListAdapter.java (93%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsSyncAdapter.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsSyncService.java (93%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/category/CategorizationFragment.java (98%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/category/Category.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/category/CategoryContentProvider.java (95%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/Contribution.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionController.java (95%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionViewHolder.java (85%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsActivity.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsContentProvider.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsListAdapter.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsListFragment.java (95%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsSyncAdapter.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsSyncService.java (93%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/MediaListAdapter.java (91%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/data/DBOpenHelper.java (80%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/CategoryImagesLoader.java (91%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/MediaDetailFragment.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/MediaDetailPagerFragment.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/MediaDetailSpacer.java (92%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/CategoryModifier.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModificationsContentProvider.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModificationsSyncAdapter.java (95%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModificationsSyncService.java (93%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModifierSequence.java (99%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/PageModifier.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/TemplateRemoveModifier.java (98%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/MultipleShareActivity.java (94%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/MultipleUploadListFragment.java (97%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/ShareActivity.java (92%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/SingleUploadFragment.java (96%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/UploadController.java (86%)
 rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/UploadService.java (96%)

diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index fd20f5bee..caf8c2712 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.wikimedia.commons"
+    package="free.nrw.commons"
     android:versionCode="17"
     android:versionName="1.2" >
 
@@ -31,15 +31,15 @@
                   android:finishOnTaskLaunch="true" />
 
         <activity
-            android:name="org.wikimedia.commons.auth.LoginActivity"
+            android:name=".auth.LoginActivity"
             android:theme="@style/NoTitle" >
         </activity>
         <activity
-            android:name="org.wikimedia.commons.WelcomeActivity"
+            android:name=".WelcomeActivity"
             android:theme="@style/NoTitle" >
         </activity>
         <activity
-            android:name="org.wikimedia.commons.upload.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="org.wikimedia.commons.upload.MultipleShareActivity"
+                android:name=".upload.MultipleShareActivity"
                 android:icon="@drawable/ic_launcher"
                 android:label="@string/app_name"
                 >
@@ -68,7 +68,7 @@
         </activity>
 
         <activity
-                android:name="org.wikimedia.commons.contributions.ContributionsActivity"
+                android:name=".contributions.ContributionsActivity"
                 android:icon="@drawable/ic_launcher"
                 android:label="@string/app_name"
                  >
@@ -78,11 +78,11 @@
              </intent-filter>
         </activity>
         <activity
-            android:name="org.wikimedia.commons.SettingsActivity"
+            android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
             />
-        <activity android:name="org.wikimedia.commons.AboutActivity" android:label="@string/title_activity_about"/>
-        <activity android:name="org.wikimedia.commons.campaigns.CampaignActivity" android:label="Campaigns"
+        <activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
+        <activity android:name=".campaigns.CampaignActivity" android:label="Campaigns"
                 android:icon="@drawable/ic_launcher"
                 >
             <intent-filter>
@@ -91,10 +91,10 @@
             </intent-filter>
         </activity>
 
-        <service android:name="org.wikimedia.commons.upload.UploadService" >
+        <service android:name=".upload.UploadService" >
         </service>
         <service
-            android:name="org.wikimedia.commons.auth.WikiAccountAuthenticatorService"
+            android:name=".auth.WikiAccountAuthenticatorService"
             android:exported="true"
             android:process=":auth" >
             <intent-filter>
@@ -106,7 +106,7 @@
                 android:resource="@xml/authenticator" />
         </service>
         <service
-                android:name="org.wikimedia.commons.campaigns.CampaignsSyncService"
+                android:name=".campaigns.CampaignsSyncService"
                 android:exported="true">
             <intent-filter>
                 <action
@@ -117,7 +117,7 @@
                     android:resource="@xml/campaigns_sync_adapter" />
         </service>
         <service
-                android:name="org.wikimedia.commons.contributions.ContributionsSyncService"
+                android:name=".contributions.ContributionsSyncService"
                 android:exported="true">
             <intent-filter>
                 <action
@@ -129,7 +129,7 @@
         </service>
 
         <service
-                android:name="org.wikimedia.commons.modifications.ModificationsSyncService"
+                android:name=".modifications.ModificationsSyncService"
                 android:exported="true">
             <intent-filter>
                 <action
@@ -141,31 +141,31 @@
         </service>
 
         <provider
-                android:name="org.wikimedia.commons.contributions.ContributionsContentProvider"
+                android:name=".contributions.ContributionsContentProvider"
                 android:label="@string/provider_contributions"
                 android:syncable="true"
-                android:authorities="org.wikimedia.commons.contributions.contentprovider"
+                android:authorities="free.nrw.commons.contributions.contentprovider"
                 android:exported="false">
         </provider>
         <provider
-                android:name="org.wikimedia.commons.campaigns.CampaignsContentProvider"
+                android:name=".campaigns.CampaignsContentProvider"
                 android:label="@string/provider_campaigns"
                 android:syncable="true"
-                android:authorities="org.wikimedia.commons.campaigns.contentprovider"
+                android:authorities="free.nrw.commons.campaigns.contentprovider"
                 android:exported="false">
         </provider>
         <provider
-                android:name="org.wikimedia.commons.modifications.ModificationsContentProvider"
+                android:name=".modifications.ModificationsContentProvider"
                 android:label="@string/provider_modifications"
                 android:syncable="true"
-                android:authorities="org.wikimedia.commons.modifications.contentprovider"
+                android:authorities="free.nrw.commons.modifications.contentprovider"
                 android:exported="false">
         </provider>
         <provider
-                android:name="org.wikimedia.commons.category.CategoryContentProvider"
+                android:name=".category.CategoryContentProvider"
                 android:label="@string/provider_categories"
                 android:syncable="false"
-                android:authorities="org.wikimedia.commons.categories.contentprovider"
+                android:authorities="free.nrw.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 e1aba9b0a..3a999316c 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="org.wikimedia.commons.contributions.ContributionsListFragment"
+        android:name="free.nrw.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 0c1e47a90..0fc369146 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"
             />
-    <org.wikimedia.commons.media.MediaDetailSpacer
+    <free.nrw.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 0ca84aa2f..3389aa04b 100644
--- a/commons/res/layout/fragment_media_detail.xml
+++ b/commons/res/layout/fragment_media_detail.xml
@@ -22,7 +22,7 @@
                android:visibility="gone"
                />
 
-    <org.wikimedia.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
+    <free.nrw.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. -->
-            <org.wikimedia.commons.media.MediaDetailSpacer
+            <free.nrw.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>
-                <org.wikimedia.commons.media.MediaDetailSpacer
+                <free.nrw.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
@@ -105,7 +105,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <org.wikimedia.commons.media.MediaDetailSpacer
+                <free.nrw.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
@@ -133,7 +133,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <org.wikimedia.commons.media.MediaDetailSpacer
+                <free.nrw.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 fdfe42f35..d5b85bc41 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/org.wikimedia.commons"
+             xmlns:custom="http://schemas.android.com/apk/res/free.nrw.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"
             />
-    <org.wikimedia.commons.MediaWikiImageView android:id="@+id/contributionImage"
+    <free.nrw.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 7a25b8777..b0443ec03 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="org.wikimedia.commons"
+    android:accountType="free.nrw.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 778984c07..53c4bdaf8 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="org.wikimedia.commons.campaigns.contentprovider"
-              android:accountType="org.wikimedia.commons"
+              android:contentAuthority="free.nrw.commons.campaigns.contentprovider"
+              android:accountType="free.nrw.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 a663c655d..605d3aba3 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="org.wikimedia.commons.contributions.contentprovider"
-              android:accountType="org.wikimedia.commons"
+              android:contentAuthority="free.nrw.commons.contributions.contentprovider"
+              android:accountType="free.nrw.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 e85d9a6d4..dfd6eb5a8 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="org.wikimedia.commons.modifications.contentprovider"
-              android:accountType="org.wikimedia.commons"
+              android:contentAuthority="free.nrw.commons.modifications.contentprovider"
+              android:accountType="free.nrw.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/free/nrw/commons/AboutActivity.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/AboutActivity.java
rename to commons/src/main/java/free/nrw/commons/AboutActivity.java
index a022e5e12..2583912cc 100644
--- a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
+++ b/commons/src/main/java/free/nrw/commons/AboutActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.os.Bundle;
 import android.text.Html;
diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/free/nrw/commons/CommonsApplication.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
rename to commons/src/main/java/free/nrw/commons/CommonsApplication.java
index 81e86e89b..14485d556 100644
--- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
+++ b/commons/src/main/java/free/nrw/commons/CommonsApplication.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import java.io.IOException;
 
@@ -25,10 +25,10 @@ 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 org.wikimedia.commons.auth.WikiAccountAuthenticator;
+import free.nrw.commons.auth.WikiAccountAuthenticator;
 import org.apache.http.impl.client.*;
 import org.apache.http.params.CoreProtocolPNames;
-import org.wikimedia.commons.data.*;
+import free.nrw.commons.data.*;
 
 import com.android.volley.toolbox.*;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/EventLog.java b/commons/src/main/java/free/nrw/commons/EventLog.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/EventLog.java
rename to commons/src/main/java/free/nrw/commons/EventLog.java
index 55e371fb6..ef1ac8ca2 100644
--- a/commons/src/main/java/org/wikimedia/commons/EventLog.java
+++ b/commons/src/main/java/free/nrw/commons/EventLog.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.content.SharedPreferences;
 import android.os.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/HandlerService.java b/commons/src/main/java/free/nrw/commons/HandlerService.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/HandlerService.java
rename to commons/src/main/java/free/nrw/commons/HandlerService.java
index 3b15a7474..f2cd929ea 100644
--- a/commons/src/main/java/org/wikimedia/commons/HandlerService.java
+++ b/commons/src/main/java/free/nrw/commons/HandlerService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/License.java b/commons/src/main/java/free/nrw/commons/License.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/License.java
rename to commons/src/main/java/free/nrw/commons/License.java
index caa9bc4d6..b7a48529f 100644
--- a/commons/src/main/java/org/wikimedia/commons/License.java
+++ b/commons/src/main/java/free/nrw/commons/License.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 public class License {
     String key;
diff --git a/commons/src/main/java/org/wikimedia/commons/LicenseList.java b/commons/src/main/java/free/nrw/commons/LicenseList.java
similarity index 95%
rename from commons/src/main/java/org/wikimedia/commons/LicenseList.java
rename to commons/src/main/java/free/nrw/commons/LicenseList.java
index b9da572b2..327faf184 100644
--- a/commons/src/main/java/org/wikimedia/commons/LicenseList.java
+++ b/commons/src/main/java/free/nrw/commons/LicenseList.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.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("org.wikimedia.commons:string/" + stringId, null, null);
+        return res.getIdentifier("free.nrw.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/free/nrw/commons/Media.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/Media.java
rename to commons/src/main/java/free/nrw/commons/Media.java
index 0ce9e64f7..505a4ebeb 100644
--- a/commons/src/main/java/org/wikimedia/commons/Media.java
+++ b/commons/src/main/java/free/nrw/commons/Media.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.net.Uri;
 import android.os.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java b/commons/src/main/java/free/nrw/commons/MediaDataExtractor.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
rename to commons/src/main/java/free/nrw/commons/MediaDataExtractor.java
index f6cc7d331..1e6b9f9bd 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
+++ b/commons/src/main/java/free/nrw/commons/MediaDataExtractor.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.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/free/nrw/commons/MediaWikiImageView.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
rename to commons/src/main/java/free/nrw/commons/MediaWikiImageView.java
index 6d779da89..15cd00ffc 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
+++ b/commons/src/main/java/free/nrw/commons/MediaWikiImageView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -27,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 org.wikimedia.commons.contributions.Contribution;
-import org.wikimedia.commons.contributions.ContributionsContentProvider;
+import free.nrw.commons.contributions.Contribution;
+import free.nrw.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/free/nrw/commons/Prefs.java
similarity index 76%
rename from commons/src/main/java/org/wikimedia/commons/Prefs.java
rename to commons/src/main/java/free/nrw/commons/Prefs.java
index b59dce641..cd912bc8d 100644
--- a/commons/src/main/java/org/wikimedia/commons/Prefs.java
+++ b/commons/src/main/java/free/nrw/commons/Prefs.java
@@ -1,7 +1,7 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 public class Prefs {
-    public static String GLOBAL_PREFS = "org.wikimedia.commons.preferences";
+    public static String GLOBAL_PREFS = "free.nrw.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/free/nrw/commons/SettingsActivity.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
rename to commons/src/main/java/free/nrw/commons/SettingsActivity.java
index 693fe4331..0b27586d9 100644
--- a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
+++ b/commons/src/main/java/free/nrw/commons/SettingsActivity.java
@@ -1,12 +1,10 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceManager;
-import android.util.Log;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 
 public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/free/nrw/commons/Utils.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/Utils.java
rename to commons/src/main/java/free/nrw/commons/Utils.java
index f7645aa26..c9a8d3c15 100644
--- a/commons/src/main/java/org/wikimedia/commons/Utils.java
+++ b/commons/src/main/java/free/nrw/commons/Utils.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.net.Uri;
 import android.os.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java b/commons/src/main/java/free/nrw/commons/WelcomeActivity.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
rename to commons/src/main/java/free/nrw/commons/WelcomeActivity.java
index 62c956334..2e1e53c83 100644
--- a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
+++ b/commons/src/main/java/free/nrw/commons/WelcomeActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons;
+package free.nrw.commons;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -9,6 +9,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 
 import com.viewpagerindicator.CirclePageIndicator;
+import free.nrw.commons.R;
 
 public class WelcomeActivity extends Activity {
     static final int PAGE_WIKIPEDIA = 0,
diff --git a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java b/commons/src/main/java/free/nrw/commons/api/MWApi.java
similarity index 73%
rename from commons/src/main/java/org/wikimedia/commons/api/MWApi.java
rename to commons/src/main/java/free/nrw/commons/api/MWApi.java
index f626b2e19..6bf91e39a 100644
--- a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
+++ b/commons/src/main/java/free/nrw/commons/api/MWApi.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.api;
+package free.nrw.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/free/nrw/commons/auth/AuthenticatedActivity.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
rename to commons/src/main/java/free/nrw/commons/auth/AuthenticatedActivity.java
index 4051a77e0..20233b27a 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
+++ b/commons/src/main/java/free/nrw/commons/auth/AuthenticatedActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.auth;
+package free.nrw.commons.auth;
 
 import java.io.IOException;
 
@@ -8,7 +8,8 @@ import com.actionbarsherlock.app.*;
 import android.accounts.*;
 import android.os.*;
 
-import org.wikimedia.commons.*;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Utils;
 
 public class AuthenticatedActivity extends SherlockFragmentActivity {
     
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java b/commons/src/main/java/free/nrw/commons/auth/LoginActivity.java
similarity index 94%
rename from commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
rename to commons/src/main/java/free/nrw/commons/auth/LoginActivity.java
index 573c0dfe9..b663ce19d 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
+++ b/commons/src/main/java/free/nrw/commons/auth/LoginActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.auth;
+package free.nrw.commons.auth;
 
 import java.io.IOException;
 
@@ -14,16 +14,18 @@ import android.view.*;
 import android.widget.*;
 import android.support.v4.app.NavUtils;
 
-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;
+import free.nrw.commons.*;
+import free.nrw.commons.EventLog;
+import free.nrw.commons.WelcomeActivity;
+import free.nrw.commons.campaigns.CampaignsContentProvider;
+import free.nrw.commons.contributions.*;
+import free.nrw.commons.modifications.ModificationsContentProvider;
+import free.nrw.commons.CommonsApplication;
 
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
-    public static final String PARAM_USERNAME = "org.wikimedia.commons.login.username";
+    public static final String PARAM_USERNAME = "free.nrw.commons.login.username";
 
     private CommonsApplication app;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java b/commons/src/main/java/free/nrw/commons/auth/WikiAccountAuthenticator.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
rename to commons/src/main/java/free/nrw/commons/auth/WikiAccountAuthenticator.java
index fe8ae8c71..332f44b6c 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
+++ b/commons/src/main/java/free/nrw/commons/auth/WikiAccountAuthenticator.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.auth;
+package free.nrw.commons.auth;
 
 import java.io.IOException;
 
@@ -7,11 +7,11 @@ import android.content.*;
 import android.os.*;
 
 import org.mediawiki.api.*;
-import org.wikimedia.commons.*;
+import free.nrw.commons.*;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
 
-    public static final String COMMONS_ACCOUNT_TYPE = "org.wikimedia.commons";
+    public static final String COMMONS_ACCOUNT_TYPE = "free.nrw.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/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
similarity index 94%
rename from commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
rename to commons/src/main/java/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
index 1f8bc17dd..1ab362d02 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
+++ b/commons/src/main/java/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.auth;
+package free.nrw.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/free/nrw/commons/campaigns/Campaign.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
rename to commons/src/main/java/free/nrw/commons/campaigns/Campaign.java
index 61b796eab..6b679e132 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/Campaign.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.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/free/nrw/commons/campaigns/CampaignActivity.java
similarity index 92%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
rename to commons/src/main/java/free/nrw/commons/campaigns/CampaignActivity.java
index 22ef9af59..7b41ee221 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/CampaignActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.commons.campaigns;
 
 import android.content.ContentResolver;
 import android.content.Intent;
@@ -11,9 +11,9 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import org.wikimedia.commons.CommonsApplication;
-import org.wikimedia.commons.R;
-import org.wikimedia.commons.contributions.ContributionsActivity;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.contributions.ContributionsActivity;
+import free.nrw.commons.R;
 
 public  class CampaignActivity
         extends SherlockFragmentActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java b/commons/src/main/java/free/nrw/commons/campaigns/CampaignContribution.java
similarity index 94%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
rename to commons/src/main/java/free/nrw/commons/campaigns/CampaignContribution.java
index c9a8045a9..12d2d0c17 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/CampaignContribution.java
@@ -1,7 +1,7 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.commons.campaigns;
 
 import android.net.Uri;
-import org.wikimedia.commons.contributions.Contribution;
+import free.nrw.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/free/nrw/commons/campaigns/CampaignsContentProvider.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
rename to commons/src/main/java/free/nrw/commons/campaigns/CampaignsContentProvider.java
index 80bd972bc..f8a84e9b4 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/CampaignsContentProvider.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.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 org.wikimedia.commons.CommonsApplication;
-import org.wikimedia.commons.data.DBOpenHelper;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.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 = "org.wikimedia.commons.campaigns.contentprovider";
+    public static final String AUTHORITY = "free.nrw.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/free/nrw/commons/campaigns/CampaignsListAdapter.java
similarity index 93%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
rename to commons/src/main/java/free/nrw/commons/campaigns/CampaignsListAdapter.java
index 009e4d035..527d86be1 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/CampaignsListAdapter.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.commons.campaigns;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import org.wikimedia.commons.Utils;
+import free.nrw.commons.Utils;
 
 class CampaignsListAdapter extends CursorAdapter {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java b/commons/src/main/java/free/nrw/commons/campaigns/CampaignsSyncAdapter.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
rename to commons/src/main/java/free/nrw/commons/campaigns/CampaignsSyncAdapter.java
index 1a0606800..fc1374832 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/CampaignsSyncAdapter.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.commons.campaigns;
 
 import android.accounts.Account;
 import android.content.*;
@@ -6,9 +6,9 @@ import android.os.Bundle;
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
+import free.nrw.commons.CommonsApplication;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
-import org.wikimedia.commons.CommonsApplication;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java b/commons/src/main/java/free/nrw/commons/campaigns/CampaignsSyncService.java
similarity index 93%
rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
rename to commons/src/main/java/free/nrw/commons/campaigns/CampaignsSyncService.java
index b7557351b..dc973212f 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
+++ b/commons/src/main/java/free/nrw/commons/campaigns/CampaignsSyncService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.campaigns;
+package free.nrw.commons.campaigns;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java b/commons/src/main/java/free/nrw/commons/category/CategorizationFragment.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
rename to commons/src/main/java/free/nrw/commons/category/CategorizationFragment.java
index cf70e9445..8c6226bfd 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
+++ b/commons/src/main/java/free/nrw/commons/category/CategorizationFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.category;
+package free.nrw.commons.category;
 
 import android.app.Activity;
 import android.content.ContentProviderClient;
@@ -13,11 +13,11 @@ import android.widget.*;
 import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Utils;
 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 free.nrw.commons.R;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/category/Category.java b/commons/src/main/java/free/nrw/commons/category/Category.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/category/Category.java
rename to commons/src/main/java/free/nrw/commons/category/Category.java
index 08c379f4e..297d0539c 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/Category.java
+++ b/commons/src/main/java/free/nrw/commons/category/Category.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.category;
+package free.nrw.commons.category;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java b/commons/src/main/java/free/nrw/commons/category/CategoryContentProvider.java
similarity index 95%
rename from commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
rename to commons/src/main/java/free/nrw/commons/category/CategoryContentProvider.java
index fa1f86c36..8a5c55a76 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
+++ b/commons/src/main/java/free/nrw/commons/category/CategoryContentProvider.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.category;
+package free.nrw.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 org.wikimedia.commons.CommonsApplication;
-import org.wikimedia.commons.data.DBOpenHelper;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.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 = "org.wikimedia.commons.categories.contentprovider";
+    public static final String AUTHORITY = "free.nrw.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/free/nrw/commons/contributions/Contribution.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
rename to commons/src/main/java/free/nrw/commons/contributions/Contribution.java
index 55d9e1cd0..9f1420e1e 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/Contribution.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import java.text.*;
 import java.util.*;
@@ -10,7 +10,7 @@ import android.net.*;
 import android.os.*;
 import android.text.*;
 
-import org.wikimedia.commons.*;
+import free.nrw.commons.*;
 
 public class Contribution extends Media {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java b/commons/src/main/java/free/nrw/commons/contributions/ContributionController.java
similarity index 95%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionController.java
index ce2a730d8..9c10fdc56 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionController.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.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 org.wikimedia.commons.campaigns.Campaign;
-import org.wikimedia.commons.upload.ShareActivity;
-import org.wikimedia.commons.upload.UploadService;
+import free.nrw.commons.campaigns.Campaign;
+import free.nrw.commons.upload.ShareActivity;
+import free.nrw.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/free/nrw/commons/contributions/ContributionViewHolder.java
similarity index 85%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionViewHolder.java
index 2f43e04dc..b5c4612c6 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionViewHolder.java
@@ -1,10 +1,10 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import org.wikimedia.commons.MediaWikiImageView;
-import org.wikimedia.commons.R;
+import free.nrw.commons.MediaWikiImageView;
+import free.nrw.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/free/nrw/commons/contributions/ContributionsActivity.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionsActivity.java
index 078e02ff7..7f72ca07a 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionsActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.database.DataSetObserver;
 import android.os.IBinder;
@@ -17,11 +17,14 @@ import android.widget.Adapter;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-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 free.nrw.commons.*;
+import free.nrw.commons.auth.*;
+import free.nrw.commons.upload.UploadService;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.HandlerService;
+import free.nrw.commons.Media;
+import free.nrw.commons.campaigns.Campaign;
+import free.nrw.commons.media.*;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java b/commons/src/main/java/free/nrw/commons/contributions/ContributionsContentProvider.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionsContentProvider.java
index c05edc1a7..02f1e4d64 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionsContentProvider.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.content.*;
 import android.database.*;
@@ -7,15 +7,15 @@ import android.net.*;
 import android.text.*;
 import android.util.*;
 
-import org.wikimedia.commons.*;
-import org.wikimedia.commons.data.*;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.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 = "org.wikimedia.commons.contributions.contentprovider";
+    public static final String AUTHORITY = "free.nrw.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/free/nrw/commons/contributions/ContributionsListAdapter.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionsListAdapter.java
index 372ff98ab..b8dcf8336 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionsListAdapter.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.app.Activity;
 import android.content.Context;
@@ -12,10 +12,10 @@ import android.view.ViewGroup;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
-import org.wikimedia.commons.CommonsApplication;
-import org.wikimedia.commons.MediaWikiImageView;
-import org.wikimedia.commons.R;
-import org.wikimedia.commons.Utils;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.MediaWikiImageView;
+import free.nrw.commons.Utils;
+import free.nrw.commons.R;
 
 class ContributionsListAdapter extends CursorAdapter {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/free/nrw/commons/contributions/ContributionsListFragment.java
similarity index 95%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionsListFragment.java
index 4de93fe89..d2497926b 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.app.Activity;
 import android.content.Context;
@@ -16,9 +16,11 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 
-import org.wikimedia.commons.*;
-import org.wikimedia.commons.R;
-import org.wikimedia.commons.campaigns.Campaign;
+import free.nrw.commons.AboutActivity;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.R;
+import free.nrw.commons.SettingsActivity;
+import free.nrw.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/free/nrw/commons/contributions/ContributionsSyncAdapter.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionsSyncAdapter.java
index aa7f37175..a6d1836b1 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionsSyncAdapter.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.content.*;
 import android.database.Cursor;
@@ -11,9 +11,9 @@ import android.os.Bundle;
 import java.io.*;
 import java.util.*;
 
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Utils;
 import org.mediawiki.api.*;
-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/free/nrw/commons/contributions/ContributionsSyncService.java
similarity index 93%
rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
rename to commons/src/main/java/free/nrw/commons/contributions/ContributionsSyncService.java
index e99f557c0..9d12c2db1 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/ContributionsSyncService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.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/free/nrw/commons/contributions/MediaListAdapter.java
similarity index 91%
rename from commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
rename to commons/src/main/java/free/nrw/commons/contributions/MediaListAdapter.java
index 654e2bb13..7b70ddc54 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
+++ b/commons/src/main/java/free/nrw/commons/contributions/MediaListAdapter.java
@@ -1,12 +1,12 @@
-package org.wikimedia.commons.contributions;
+package free.nrw.commons.contributions;
 
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import org.wikimedia.commons.CommonsApplication;
-import org.wikimedia.commons.Media;
-import org.wikimedia.commons.R;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Media;
+import free.nrw.commons.R;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java b/commons/src/main/java/free/nrw/commons/data/DBOpenHelper.java
similarity index 80%
rename from commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
rename to commons/src/main/java/free/nrw/commons/data/DBOpenHelper.java
index a8560a9f5..83962f9e1 100644
--- a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
+++ b/commons/src/main/java/free/nrw/commons/data/DBOpenHelper.java
@@ -1,12 +1,12 @@
-package org.wikimedia.commons.data;
+package free.nrw.commons.data;
 
 import android.content.*;
 import android.database.sqlite.*;
 
-import org.wikimedia.commons.campaigns.Campaign;
-import org.wikimedia.commons.category.Category;
-import org.wikimedia.commons.contributions.*;
-import org.wikimedia.commons.modifications.ModifierSequence;
+import free.nrw.commons.campaigns.Campaign;
+import free.nrw.commons.category.Category;
+import free.nrw.commons.modifications.ModifierSequence;
+import free.nrw.commons.contributions.*;
 
 public class DBOpenHelper  extends SQLiteOpenHelper{
 
diff --git a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java b/commons/src/main/java/free/nrw/commons/media/CategoryImagesLoader.java
similarity index 91%
rename from commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
rename to commons/src/main/java/free/nrw/commons/media/CategoryImagesLoader.java
index 02e517f35..247a7766e 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
+++ b/commons/src/main/java/free/nrw/commons/media/CategoryImagesLoader.java
@@ -1,12 +1,12 @@
-package org.wikimedia.commons.media;
+package free.nrw.commons.media;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 import android.util.Log;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Media;
 import org.mediawiki.api.ApiResult;
-import org.wikimedia.commons.CommonsApplication;
-import org.wikimedia.commons.Media;
-import org.wikimedia.commons.Utils;
+import free.nrw.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/free/nrw/commons/media/MediaDetailFragment.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
rename to commons/src/main/java/free/nrw/commons/media/MediaDetailFragment.java
index bbec31ec2..909bfc1a1 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
+++ b/commons/src/main/java/free/nrw/commons/media/MediaDetailFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.media;
+package free.nrw.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 org.wikimedia.commons.*;
+import free.nrw.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/free/nrw/commons/media/MediaDetailPagerFragment.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
rename to commons/src/main/java/free/nrw/commons/media/MediaDetailPagerFragment.java
index e76e25efc..e0df2373b 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
+++ b/commons/src/main/java/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.media;
+package free.nrw.commons.media;
 
 import android.app.DownloadManager;
 import android.content.*;
@@ -17,9 +17,12 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import org.wikimedia.commons.*;
-import org.wikimedia.commons.contributions.Contribution;
-import org.wikimedia.commons.contributions.ContributionsActivity;
+import free.nrw.commons.*;
+import free.nrw.commons.contributions.ContributionsActivity;
+import free.nrw.commons.EventLog;
+import free.nrw.commons.contributions.Contribution;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Media;
 
 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/free/nrw/commons/media/MediaDetailSpacer.java
similarity index 92%
rename from commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
rename to commons/src/main/java/free/nrw/commons/media/MediaDetailSpacer.java
index 49b048535..a1b067231 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
+++ b/commons/src/main/java/free/nrw/commons/media/MediaDetailSpacer.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.media;
+package free.nrw.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/free/nrw/commons/modifications/CategoryModifier.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
rename to commons/src/main/java/free/nrw/commons/modifications/CategoryModifier.java
index 2c1a0e049..8995dde91 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/CategoryModifier.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.commons.modifications;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java b/commons/src/main/java/free/nrw/commons/modifications/ModificationsContentProvider.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
rename to commons/src/main/java/free/nrw/commons/modifications/ModificationsContentProvider.java
index dc7beff75..31f3c8443 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/ModificationsContentProvider.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.commons.modifications;
 
 import android.content.*;
 import android.database.*;
@@ -7,15 +7,15 @@ import android.net.*;
 import android.text.*;
 import android.util.*;
 
-import org.wikimedia.commons.*;
-import org.wikimedia.commons.data.*;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.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 = "org.wikimedia.commons.modifications.contentprovider";
+    public static final String AUTHORITY = "free.nrw.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/free/nrw/commons/modifications/ModificationsSyncAdapter.java
similarity index 95%
rename from commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
rename to commons/src/main/java/free/nrw/commons/modifications/ModificationsSyncAdapter.java
index 8bfa4987b..cb7a55673 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/ModificationsSyncAdapter.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.commons.modifications;
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
@@ -12,11 +12,11 @@ import android.os.Bundle;
 
 import java.io.*;
 
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Utils;
+import free.nrw.commons.contributions.ContributionsContentProvider;
 import org.mediawiki.api.*;
-import org.wikimedia.commons.Utils;
-import org.wikimedia.commons.*;
-import org.wikimedia.commons.contributions.Contribution;
-import org.wikimedia.commons.contributions.ContributionsContentProvider;
+import free.nrw.commons.contributions.Contribution;
 
 
 public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java b/commons/src/main/java/free/nrw/commons/modifications/ModificationsSyncService.java
similarity index 93%
rename from commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
rename to commons/src/main/java/free/nrw/commons/modifications/ModificationsSyncService.java
index 86a80fa94..d8af199dd 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/ModificationsSyncService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.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/free/nrw/commons/modifications/ModifierSequence.java
similarity index 99%
rename from commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
rename to commons/src/main/java/free/nrw/commons/modifications/ModifierSequence.java
index c505fa4d9..841ad11ad 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/ModifierSequence.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.commons.modifications;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java b/commons/src/main/java/free/nrw/commons/modifications/PageModifier.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
rename to commons/src/main/java/free/nrw/commons/modifications/PageModifier.java
index 98529ca52..63e249392 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/PageModifier.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.commons.modifications;
 
 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/free/nrw/commons/modifications/TemplateRemoveModifier.java
similarity index 98%
rename from commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
rename to commons/src/main/java/free/nrw/commons/modifications/TemplateRemoveModifier.java
index 25b37dab5..7fbc3a00a 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
+++ b/commons/src/main/java/free/nrw/commons/modifications/TemplateRemoveModifier.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.modifications;
+package free.nrw.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/free/nrw/commons/upload/MultipleShareActivity.java
similarity index 94%
rename from commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
rename to commons/src/main/java/free/nrw/commons/upload/MultipleShareActivity.java
index 924079b26..b6fd1124e 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
+++ b/commons/src/main/java/free/nrw/commons/upload/MultipleShareActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.upload;
+package free.nrw.commons.upload;
 
 import java.util.*;
 
@@ -13,15 +13,18 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 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;
-import org.wikimedia.commons.modifications.ModificationsContentProvider;
-import org.wikimedia.commons.modifications.ModifierSequence;
-import org.wikimedia.commons.modifications.TemplateRemoveModifier;
+import free.nrw.commons.*;
+import free.nrw.commons.auth.*;
+import free.nrw.commons.EventLog;
+import free.nrw.commons.category.CategorizationFragment;
+import free.nrw.commons.contributions.*;
+import free.nrw.commons.media.*;
+import free.nrw.commons.modifications.CategoryModifier;
+import free.nrw.commons.modifications.ModificationsContentProvider;
+import free.nrw.commons.modifications.ModifierSequence;
+import free.nrw.commons.modifications.TemplateRemoveModifier;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.Media;
 
 public  class       MultipleShareActivity
         extends     AuthenticatedActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java b/commons/src/main/java/free/nrw/commons/upload/MultipleUploadListFragment.java
similarity index 97%
rename from commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
rename to commons/src/main/java/free/nrw/commons/upload/MultipleUploadListFragment.java
index 0a54087b2..5bb6eb880 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
+++ b/commons/src/main/java/free/nrw/commons/upload/MultipleUploadListFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.upload;
+package free.nrw.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 org.wikimedia.commons.R;
-import org.wikimedia.commons.Utils;
-import org.wikimedia.commons.contributions.*;
-import org.wikimedia.commons.media.*;
+import free.nrw.commons.R;
+import free.nrw.commons.Utils;
+import free.nrw.commons.contributions.*;
+import free.nrw.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/free/nrw/commons/upload/ShareActivity.java
similarity index 92%
rename from commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
rename to commons/src/main/java/free/nrw/commons/upload/ShareActivity.java
index 64f5235eb..06ff7cb5e 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
+++ b/commons/src/main/java/free/nrw/commons/upload/ShareActivity.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.upload;
+package free.nrw.commons.upload;
 
 import android.content.*;
 import android.os.*;
@@ -8,15 +8,17 @@ import android.support.v4.app.NavUtils;
 import com.actionbarsherlock.view.MenuItem;
 import android.widget.*;
 
-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 free.nrw.commons.*;
+import free.nrw.commons.campaigns.Campaign;
+import free.nrw.commons.modifications.ModifierSequence;
+import free.nrw.commons.category.CategorizationFragment;
+import free.nrw.commons.contributions.*;
+import free.nrw.commons.auth.*;
+import free.nrw.commons.modifications.CategoryModifier;
+import free.nrw.commons.modifications.ModificationsContentProvider;
+import free.nrw.commons.modifications.TemplateRemoveModifier;
+import free.nrw.commons.CommonsApplication;
+import free.nrw.commons.EventLog;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java b/commons/src/main/java/free/nrw/commons/upload/SingleUploadFragment.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
rename to commons/src/main/java/free/nrw/commons/upload/SingleUploadFragment.java
index adbc745c4..eb3b8f177 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
+++ b/commons/src/main/java/free/nrw/commons/upload/SingleUploadFragment.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.upload;
+package free.nrw.commons.upload;
 
 import android.app.Activity;
 import android.content.Context;
@@ -20,9 +20,9 @@ import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import org.wikimedia.commons.Prefs;
-import org.wikimedia.commons.R;
-import org.wikimedia.commons.Utils;
+import free.nrw.commons.Prefs;
+import free.nrw.commons.Utils;
+import free.nrw.commons.R;
 
 public class SingleUploadFragment extends SherlockFragment {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java b/commons/src/main/java/free/nrw/commons/upload/UploadController.java
similarity index 86%
rename from commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
rename to commons/src/main/java/free/nrw/commons/upload/UploadController.java
index f232eb4de..c81f19e26 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
+++ b/commons/src/main/java/free/nrw/commons/upload/UploadController.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.upload;
+package free.nrw.commons.upload;
 
 import android.app.Activity;
 import android.content.*;
@@ -10,13 +10,13 @@ import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
-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 free.nrw.commons.CommonsApplication;
+import free.nrw.commons.HandlerService;
+import free.nrw.commons.Prefs;
+import free.nrw.commons.Utils;
+import free.nrw.commons.campaigns.Campaign;
+import free.nrw.commons.campaigns.CampaignContribution;
+import free.nrw.commons.contributions.Contribution;
 
 import java.io.IOException;
 import java.util.Date;
@@ -115,30 +115,30 @@ public class UploadController {
             protected Contribution doInBackground(Void... voids /* stare into you */) {
                 long length;
                 try {
-                    if(contribution.getDataLength() <= 0) {
+                    if (contribution.getDataLength() <= 0) {
                         length = activity.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength();
-                        if(length == -1) {
+                        if (length == -1) {
                             // Let us find out the long way!
                             length = Utils.countBytes(activity.getContentResolver().openInputStream(contribution.getLocalUri()));
                         }
                         contribution.setDataLength(length);
                     }
-                } catch(IOException e) {
+                } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
 
-                String mimeType = (String)contribution.getTag("mimeType");
-                if(mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) {
+                String mimeType = (String) contribution.getTag("mimeType");
+                if (mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) {
                     mimeType = activity.getContentResolver().getType(contribution.getLocalUri());
-                    if(mimeType != null) {
+                    if (mimeType != null) {
                         contribution.setTag("mimeType", mimeType);
                     }
                 }
 
-                if(mimeType.startsWith("image/") && contribution.getDateCreated() == null) {
+                if (mimeType.startsWith("image/") && contribution.getDateCreated() == null) {
                     Cursor cursor = activity.getContentResolver().query(contribution.getLocalUri(),
                             new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
-                    if(cursor != null && cursor.getCount() != 0) {
+                    if (cursor != null && cursor.getCount() != 0) {
                         cursor.moveToFirst();
                         contribution.setDateCreated(new Date(cursor.getLong(0)));
                     } // FIXME: Alternate way of setting dateCreated if this data is not found
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java b/commons/src/main/java/free/nrw/commons/upload/UploadService.java
similarity index 96%
rename from commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
rename to commons/src/main/java/free/nrw/commons/upload/UploadService.java
index 69b0ee5fc..1fdf95200 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
+++ b/commons/src/main/java/free/nrw/commons/upload/UploadService.java
@@ -1,4 +1,4 @@
-package org.wikimedia.commons.upload;
+package free.nrw.commons.upload;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -17,13 +17,14 @@ 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;
+import free.nrw.commons.*;
+import free.nrw.commons.contributions.*;
+import free.nrw.commons.EventLog;
+import free.nrw.commons.modifications.ModificationsContentProvider;
 
 public class UploadService extends HandlerService<Contribution> {
 
-    private static final String EXTRA_PREFIX = "org.wikimedia.commons.upload";
+    private static final String EXTRA_PREFIX = "free.nrw.commons.upload";
 
     public static final int ACTION_UPLOAD_FILE = 1;
 
@@ -222,7 +223,7 @@ public class UploadService extends HandlerService<Contribution> {
             if(!resultStatus.equals("Success")) {
                 String errorCode = result.getString("/api/error/@code");
                 showFailedNotification(contribution);
-                org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
+                EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource())
                         .param("multiple", contribution.getMultiple())
@@ -240,7 +241,7 @@ public class UploadService extends HandlerService<Contribution> {
                 contribution.setDateUploaded(dateUploaded);
                 contribution.save();
 
-                org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
+                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 1b06132b8..8f20c96e9 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="org.wikimedia.commons.campaigns.contentprovider"
+-                android:authorities="free.nrw.commons.campaigns.contentprovider"
 -                android:exported="false">
 -        </provider>
 -        <provider