diff --git a/.gitignore b/.gitignore
index 655a646af..dafe1aa88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,4 +64,5 @@ local.properties
 
 #Android keystore
 *.keystores
-signingrelease.properties
\ No newline at end of file
+signingrelease.properties
+fabric.properties
\ No newline at end of file
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 722cadb27..0662b0cad 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.magicmicky.habitrpgmobileapp"
+    package="com.habitrpg.android.habitica"
     android:versionCode="49"
     android:versionName="2.4.5" >
 
@@ -16,7 +16,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.magicmicky.habitrpgmobileapp.MainActivity"
+            android:name="com.habitrpg.android.habitica.MainActivity"
             android:label="@string/app_name">
 
             <intent-filter>
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
 		<activity
-				android:name="com.magicmicky.habitrpgmobileapp.prefs.PrefsActivity"
+				android:name="com.habitrpg.android.habitica.prefs.PrefsActivity"
 				android:label="@string/PS_param_title">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -34,7 +34,7 @@
 		</activity>
 
 		<activity
-			android:name="com.magicmicky.habitrpgmobileapp.LoginActivity"
+			android:name="com.habitrpg.android.habitica.LoginActivity"
 			android:label="@string/LoginActivityName"
 			android:windowSoftInputMode="adjustResize">
 		<intent-filter>
@@ -44,7 +44,7 @@
         <receiver
             android:icon="@drawable/ic_launcher"
             android:label="HabitRPG Simple Widget"
-            android:name=".widget.SimpleWidget" >
+            android:name="com.habitrpg.android.habitica.widget.SimpleWidget" >
             <intent-filter >
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -53,7 +53,7 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_info" />
         </receiver>
-        <service android:name="com.magicmicky.habitrpgmobileapp.widget.UpdateWidgetService"/>
+        <service android:name="com.habitrpg.android.habitica.widget.UpdateWidgetService"/>
 
         <meta-data
             android:name="io.fabric.ApiKey"
diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index fe27c4a56..e69a2933b 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -85,11 +85,12 @@
     <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
     <orderEntry type="library" exported="" name="crouton-1.8.1" level="project" />
-    <orderEntry type="library" exported="" name="crashlytics-2.2.4" level="project" />
     <orderEntry type="library" exported="" name="lib-1.7" level="project" />
     <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="answers-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-18.0.0" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.1" level="project" />
+    <orderEntry type="library" exported="" name="crashlytics-2.3.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index a239906ba..054b08738 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     aarLinkSources 'com.magicmicky.habitrpgwrapper:lib:1.7:sources@jar'
 
     compile 'com.android.support:appcompat-v7:18.0.+'
-    compile('com.crashlytics.sdk.android:crashlytics:2.2.4@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.3.0@aar') {
         transitive = true;
     }
 }
diff --git a/Habitica/res/layout/habit.xml b/Habitica/res/layout/habit.xml
index ade1a9770..c7a9a69f5 100644
--- a/Habitica/res/layout/habit.xml
+++ b/Habitica/res/layout/habit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.magicmicky.habitrpgmobileapp.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.habitrpg.android.habitica.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="@dimen/row_size"
         android:background="@drawable/drawer_activated_background"
@@ -71,4 +71,4 @@
 		</FrameLayout>
 		
 
-</com.magicmicky.habitrpgmobileapp.CheckableLinearLayout>
\ No newline at end of file
+</com.habitrpg.android.habitica.CheckableLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/reward.xml b/Habitica/res/layout/reward.xml
index c061e24db..563f31eda 100644
--- a/Habitica/res/layout/reward.xml
+++ b/Habitica/res/layout/reward.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.magicmicky.habitrpgmobileapp.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.habitrpg.android.habitica.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
 		android:layout_height="@dimen/row_size"
 		android:background="@drawable/item_background"
@@ -31,4 +31,4 @@
 		    android:gravity="left"/>
 		
 
-</com.magicmicky.habitrpgmobileapp.CheckableLinearLayout>
\ No newline at end of file
+</com.habitrpg.android.habitica.CheckableLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/todo.xml b/Habitica/res/layout/todo.xml
index 4269052af..3a16f5035 100644
--- a/Habitica/res/layout/todo.xml
+++ b/Habitica/res/layout/todo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.magicmicky.habitrpgmobileapp.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.habitrpg.android.habitica.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
 		android:layout_height="@dimen/row_size"
 		android:background="@drawable/item_background"
@@ -63,4 +63,4 @@
 <!--             android:paddingLeft="10dp" -->
 <!--             /> -->
 
-</com.magicmicky.habitrpgmobileapp.CheckableLinearLayout>
\ No newline at end of file
+</com.habitrpg.android.habitica.CheckableLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 993d77c91..2e693e29a 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Habit AndroRPG</string>
+    <string name="app_name">Habitica</string>
     <string name="action_settings">Settings</string>
     <string name="action_refresh">Refresh</string>
     <string name="hello_world">Hello world!</string>
@@ -16,7 +16,7 @@
 	<string name="ERR_pb_barcode">Prefs couldn\'t be loaded from the barcode</string>
 	<string name="settings_changed">Settings were successfully updated!</string>
 	<string name="pref_dialog_title">HabitRPG settings</string>
-	<string name="string_pref_dialog_positive">Ok!</string>
+	<string name="string_pref_dialog_positive">OK</string>
 	<!--  Prefs -->
 	<string name="PS_param_title">Params</string>
 	<string name="PS_param_summary">Server config</string>
@@ -48,7 +48,7 @@
 	<string name="task_value">Value:</string>
 	<string name="task_up">Up</string>
 	<string name="task_down">Down</string>
-	<string name="dialog_confirm_button">Ok</string>
+	<string name="dialog_confirm_button">OK</string>
 	<string name="dialog_cancel_button">Cancel</string>
 	<string name="task_value_hint">20</string>
 	<string name="task_creation_fail">Task creation has failed: you need to provide a title</string>
@@ -105,7 +105,7 @@
 		Try to be more careful with your dailies, and manage those bad habits!
 	</string>
 	<string name="string_revive">Revive</string>
-    <string name="refreshing_widget">Refreshing widget...</string>
+    <string name="refreshing_widget">Refreshing widget…</string>
     <string name="please_connect">Please connect through the application before using a widget</string>
     <!--<string name="upgrade_premium_widget">To use the widget, please upgrade to premium.</string>-->
     <string name="title_changelog">Change log</string>
diff --git a/Habitica/res/xml/app_prefs_cat1.xml b/Habitica/res/xml/app_prefs_cat1.xml
index 8ffc082ec..d978686e6 100644
--- a/Habitica/res/xml/app_prefs_cat1.xml
+++ b/Habitica/res/xml/app_prefs_cat1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/PS_param_title">
-    <com.magicmicky.habitrpgmobileapp.prefs.CustomListPreference
+    <com.habitrpg.android.habitica.prefs.CustomListPreference
         android:key="@string/SP_address"
         android:title="@string/SP_address_title"
 	    android:dialogTitle="@string/SP_address_title"
diff --git a/Habitica/res/xml/pref_headers.xml b/Habitica/res/xml/pref_headers.xml
index df0dc04c6..78fa844ea 100644
--- a/Habitica/res/xml/pref_headers.xml
+++ b/Habitica/res/xml/pref_headers.xml
@@ -2,7 +2,7 @@
 <preference-headers
     xmlns:android="http://schemas.android.com/apk/res/android" >
  
-    <header android:fragment="com.magicmicky.habitrpgmobileapp.prefs.PrefsActivity$PrefsFragment"
+    <header android:fragment="com.habitrpg.android.habitica.prefs.PrefsActivity$PrefsFragment"
         android:title="@string/PS_param_title"
         android:icon="@drawable/ic_action_computer"
         android:summary="@string/PS_param_summary">
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/APIHelper.java b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
similarity index 95%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/APIHelper.java
rename to Habitica/src/com/habitrpg/android/habitica/APIHelper.java
index 960b08e29..179b830ed 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/APIHelper.java
+++ b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
@@ -1,15 +1,10 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
-import com.magicmicky.habitrpgmobileapp.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskDeletionCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskScoringCallback;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.callbacks.TaskDeletionCallback;
+import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
 import com.magicmicky.habitrpgwrapper.lib.HabitRPGInteractor;
-import com.magicmicky.habitrpgwrapper.lib.api.HabitItemCallback;
 import com.magicmicky.habitrpgwrapper.lib.api.Server;
-import com.magicmicky.habitrpgwrapper.lib.api.TaskDirectionCallback;
-import com.magicmicky.habitrpgwrapper.lib.api.UserCallback;
-import com.magicmicky.habitrpgwrapper.lib.api.VoidCallback;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection;
 import com.magicmicky.habitrpgwrapper.lib.models.UserAuth;
 import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/AddTaskDialog.java b/Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java
similarity index 98%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/AddTaskDialog.java
rename to Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java
index 2ff68973e..9645d119f 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/AddTaskDialog.java
+++ b/Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -8,7 +8,6 @@ import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.graphics.Typeface;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.util.Log;
@@ -32,9 +31,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Reward;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ToDo;
 import com.magicmicky.habitrpgwrapper.lib.utils.DaysUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import static com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType.*;
 import static com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType.habit;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/CardFragment.java b/Habitica/src/com/habitrpg/android/habitica/CardFragment.java
similarity index 98%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/CardFragment.java
rename to Habitica/src/com/habitrpg/android/habitica/CardFragment.java
index 8b71aa982..21630556e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/CardFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/CardFragment.java
@@ -1,13 +1,13 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskDeletionCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskScoringCallback;
-import com.magicmicky.habitrpgmobileapp.prefs.PrefsActivity;
+import com.habitrpg.android.habitica.callbacks.TaskDeletionCallback;
+import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
+import com.habitrpg.android.habitica.prefs.PrefsActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Reward;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/ChangeLogDialog.java b/Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java
similarity index 99%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/ChangeLogDialog.java
rename to Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java
index 5d94c2d80..3e4d8739e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/ChangeLogDialog.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/CheckableLinearLayout.java b/Habitica/src/com/habitrpg/android/habitica/CheckableLinearLayout.java
similarity index 95%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/CheckableLinearLayout.java
rename to Habitica/src/com/habitrpg/android/habitica/CheckableLinearLayout.java
index fcfac28b2..f5a74091e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/CheckableLinearLayout.java
+++ b/Habitica/src/com/habitrpg/android/habitica/CheckableLinearLayout.java
@@ -1,8 +1,7 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.Checkable;
 import android.widget.CheckedTextView;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/DailyFragment.java b/Habitica/src/com/habitrpg/android/habitica/DailyFragment.java
similarity index 98%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/DailyFragment.java
rename to Habitica/src/com/habitrpg/android/habitica/DailyFragment.java
index 567038f89..8ce177a33 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/DailyFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/DailyFragment.java
@@ -1,9 +1,8 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/DatePickerFragment.java b/Habitica/src/com/habitrpg/android/habitica/DatePickerFragment.java
similarity index 96%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/DatePickerFragment.java
rename to Habitica/src/com/habitrpg/android/habitica/DatePickerFragment.java
index 3bbf47747..2e19cf4eb 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/DatePickerFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/DatePickerFragment.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import java.util.Calendar;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/HabitFragment.java b/Habitica/src/com/habitrpg/android/habitica/HabitFragment.java
similarity index 98%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/HabitFragment.java
rename to Habitica/src/com/habitrpg/android/habitica/HabitFragment.java
index 633c55e77..f47e19056 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/HabitFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/HabitFragment.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/HostConfig.java b/Habitica/src/com/habitrpg/android/habitica/HostConfig.java
similarity index 97%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/HostConfig.java
rename to Habitica/src/com/habitrpg/android/habitica/HostConfig.java
index c8d8e2b11..3ed42523b 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/HostConfig.java
+++ b/Habitica/src/com/habitrpg/android/habitica/HostConfig.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 import java.lang.String; /**
  * The configuration of the host<br />
  * Currently, the Port isn't used at all.
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/LoginActivity.java b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
similarity index 98%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/LoginActivity.java
rename to Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
index ea9f2a8d9..468a834f6 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/LoginActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -26,10 +26,10 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.magicmicky.habitrpgmobileapp.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgmobileapp.prefs.PrefsActivity;
-import com.magicmicky.habitrpgmobileapp.prefs.scanner.IntentIntegrator;
-import com.magicmicky.habitrpgmobileapp.prefs.scanner.IntentResult;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.prefs.PrefsActivity;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
similarity index 97%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/MainActivity.java
rename to Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index 0fc4d7abb..08e5a05d8 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -1,23 +1,20 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import com.crashlytics.android.Crashlytics;
 import io.fabric.sdk.android.Fabric;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.TimeZone;
 
-import com.magicmicky.habitrpgmobileapp.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskCreationCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskDeletionCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskScoringCallback;
-import com.magicmicky.habitrpgmobileapp.callbacks.TaskUpdateCallback;
-import com.magicmicky.habitrpgmobileapp.prefs.PrefsActivity;
-import com.magicmicky.habitrpgmobileapp.userpicture.UserPicture;
-import com.magicmicky.habitrpgwrapper.lib.api.HabitItemCallback;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.callbacks.TaskCreationCallback;
+import com.habitrpg.android.habitica.callbacks.TaskDeletionCallback;
+import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
+import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback;
+import com.habitrpg.android.habitica.prefs.PrefsActivity;
+import com.habitrpg.android.habitica.userpicture.UserPicture;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Daily;
@@ -29,9 +26,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.ToDo;
 
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
-import retrofit.Callback;
-import retrofit.RetrofitError;
-import retrofit.client.Response;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -41,7 +35,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -57,7 +50,6 @@ import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.util.SparseArray;
-import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/OnTaskCreationListener.java b/Habitica/src/com/habitrpg/android/habitica/OnTaskCreationListener.java
similarity index 84%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/OnTaskCreationListener.java
rename to Habitica/src/com/habitrpg/android/habitica/OnTaskCreationListener.java
index 07f222ca3..c615fff54 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/OnTaskCreationListener.java
+++ b/Habitica/src/com/habitrpg/android/habitica/OnTaskCreationListener.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/OnTasksChanged.java b/Habitica/src/com/habitrpg/android/habitica/OnTasksChanged.java
similarity index 83%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/OnTasksChanged.java
rename to Habitica/src/com/habitrpg/android/habitica/OnTasksChanged.java
index 4e8336e60..e167d1603 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/OnTasksChanged.java
+++ b/Habitica/src/com/habitrpg/android/habitica/OnTasksChanged.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/RewardFragment.java b/Habitica/src/com/habitrpg/android/habitica/RewardFragment.java
similarity index 96%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/RewardFragment.java
rename to Habitica/src/com/habitrpg/android/habitica/RewardFragment.java
index 671cf2a88..ff84ad33e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/RewardFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/RewardFragment.java
@@ -1,13 +1,9 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/TagAdapter.java b/Habitica/src/com/habitrpg/android/habitica/TagAdapter.java
similarity index 93%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/TagAdapter.java
rename to Habitica/src/com/habitrpg/android/habitica/TagAdapter.java
index 45a243bb0..1c5410f4e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/TagAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TagAdapter.java
@@ -1,13 +1,10 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import android.content.Context;
-import android.os.Build;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.CheckedTextView;
 import android.widget.TextView;
 
 import com.magicmicky.habitrpgwrapper.lib.models.Tag;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/ToDoFragment.java b/Habitica/src/com/habitrpg/android/habitica/ToDoFragment.java
similarity index 98%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/ToDoFragment.java
rename to Habitica/src/com/habitrpg/android/habitica/ToDoFragment.java
index 8ce328ef3..3110e60db 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/ToDoFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ToDoFragment.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp;
+package com.habitrpg.android.habitica;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/HabitRPGUserCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
similarity index 89%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/HabitRPGUserCallback.java
rename to Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
index 419b53036..9c76d8baf 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/HabitRPGUserCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
@@ -1,9 +1,8 @@
-package com.magicmicky.habitrpgmobileapp.callbacks;
+package com.habitrpg.android.habitica.callbacks;
 
 import android.util.Log;
 
 import com.crashlytics.android.Crashlytics;
-import com.magicmicky.habitrpgwrapper.lib.HabitRPGInteractor;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import retrofit.Callback;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskCreationCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
similarity index 94%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskCreationCallback.java
rename to Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
index e0e718415..4b5ba6ea5 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskCreationCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.callbacks;
+package com.habitrpg.android.habitica.callbacks;
 
 import android.util.Log;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskDeletionCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskDeletionCallback.java
similarity index 95%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskDeletionCallback.java
rename to Habitica/src/com/habitrpg/android/habitica/callbacks/TaskDeletionCallback.java
index b29799846..43ffe4b70 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskDeletionCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskDeletionCallback.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.callbacks;
+package com.habitrpg.android.habitica.callbacks;
 
 import android.util.Log;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskScoringCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
similarity index 95%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskScoringCallback.java
rename to Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
index f99767602..f1a50e8f8 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskScoringCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.callbacks;
+package com.habitrpg.android.habitica.callbacks;
 
 import android.util.Log;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskUpdateCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
similarity index 94%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskUpdateCallback.java
rename to Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
index 6cb4c0d40..3c9f3ff99 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/callbacks/TaskUpdateCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.callbacks;
+package com.habitrpg.android.habitica.callbacks;
 
 import android.util.Log;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/CustomListPreference.java b/Habitica/src/com/habitrpg/android/habitica/prefs/CustomListPreference.java
similarity index 99%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/CustomListPreference.java
rename to Habitica/src/com/habitrpg/android/habitica/prefs/CustomListPreference.java
index 128e77038..68c2e03dc 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/CustomListPreference.java
+++ b/Habitica/src/com/habitrpg/android/habitica/prefs/CustomListPreference.java
@@ -1,9 +1,7 @@
-package com.magicmicky.habitrpgmobileapp.prefs;
+package com.habitrpg.android.habitica.prefs;
 
 import java.util.ArrayList;
 
-import com.magicmicky.habitrpgmobileapp.R;
-
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -24,6 +22,8 @@ import android.widget.RadioButton;
 import android.widget.TextView;
 import android.app.AlertDialog.Builder;
 
+import com.habitrpg.android.habitica.R;
+
 public class CustomListPreference extends ListPreference
 {   
 	private CustomListPreferenceAdapter customListPreferenceAdapter = null;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/PrefsActivity.java b/Habitica/src/com/habitrpg/android/habitica/prefs/PrefsActivity.java
similarity index 95%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/PrefsActivity.java
rename to Habitica/src/com/habitrpg/android/habitica/prefs/PrefsActivity.java
index 55fd4aa47..b024c2ea4 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/PrefsActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/prefs/PrefsActivity.java
@@ -1,12 +1,12 @@
-package com.magicmicky.habitrpgmobileapp.prefs;
+package com.habitrpg.android.habitica.prefs;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import com.magicmicky.habitrpgmobileapp.ChangeLogDialog;
-import com.magicmicky.habitrpgmobileapp.HostConfig;
-import com.magicmicky.habitrpgmobileapp.R;
+import com.habitrpg.android.habitica.ChangeLogDialog;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/scanner/IntentIntegrator.java b/Habitica/src/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
similarity index 99%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/scanner/IntentIntegrator.java
rename to Habitica/src/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
index dd625d325..87abebece 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/scanner/IntentIntegrator.java
+++ b/Habitica/src/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.prefs.scanner;
+package com.habitrpg.android.habitica.prefs.scanner;
 
 /*
  * Copyright 2009 ZXing authors
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/scanner/IntentResult.java b/Habitica/src/com/habitrpg/android/habitica/prefs/scanner/IntentResult.java
similarity index 97%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/scanner/IntentResult.java
rename to Habitica/src/com/habitrpg/android/habitica/prefs/scanner/IntentResult.java
index cba0d08ca..8f3fe68f1 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/prefs/scanner/IntentResult.java
+++ b/Habitica/src/com/habitrpg/android/habitica/prefs/scanner/IntentResult.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.prefs.scanner;
+package com.habitrpg.android.habitica.prefs.scanner;
 /*
  * Copyright 2009 ZXing authors
  *
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserObject.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserObject.java
similarity index 96%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserObject.java
rename to Habitica/src/com/habitrpg/android/habitica/userpicture/UserObject.java
index 766ed4139..03b3da92b 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserObject.java
+++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserObject.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.userpicture;
+package com.habitrpg.android.habitica.userpicture;
 
 public class UserObject {
 	  private String image;
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserPicture.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
similarity index 97%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserPicture.java
rename to Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
index ee186e3d0..4e314bc8e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserPicture.java
+++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
@@ -1,6 +1,6 @@
-package com.magicmicky.habitrpgmobileapp.userpicture;
+package com.habitrpg.android.habitica.userpicture;
 
-import com.magicmicky.habitrpgmobileapp.R;
+import com.habitrpg.android.habitica.R;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Items;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserSprite.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserSprite.java
similarity index 99%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserSprite.java
rename to Habitica/src/com/habitrpg/android/habitica/userpicture/UserSprite.java
index 39ff17509..476a2c48e 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/userpicture/UserSprite.java
+++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserSprite.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.userpicture;
+package com.habitrpg.android.habitica.userpicture;
 
 import java.lang.reflect.Field;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/widget/SimpleWidget.java b/Habitica/src/com/habitrpg/android/habitica/widget/SimpleWidget.java
similarity index 84%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/widget/SimpleWidget.java
rename to Habitica/src/com/habitrpg/android/habitica/widget/SimpleWidget.java
index 9beb4a32b..a79b9e862 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/widget/SimpleWidget.java
+++ b/Habitica/src/com/habitrpg/android/habitica/widget/SimpleWidget.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.widget;
+package com.habitrpg.android.habitica.widget;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetManager;
@@ -6,30 +6,13 @@ import android.appwidget.AppWidgetProvider;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.RemoteViews;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import com.magicmicky.habitrpgmobileapp.R;
-import com.magicmicky.habitrpgmobileapp.userpicture.UserPicture;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
+import com.habitrpg.android.habitica.R;
 
 /**
  * Define a simple custom widget for the habitrpg client
diff --git a/Habitica/src/com/magicmicky/habitrpgmobileapp/widget/UpdateWidgetService.java b/Habitica/src/com/habitrpg/android/habitica/widget/UpdateWidgetService.java
similarity index 92%
rename from Habitica/src/com/magicmicky/habitrpgmobileapp/widget/UpdateWidgetService.java
rename to Habitica/src/com/habitrpg/android/habitica/widget/UpdateWidgetService.java
index 1d0fb75c3..468a01d3b 100644
--- a/Habitica/src/com/magicmicky/habitrpgmobileapp/widget/UpdateWidgetService.java
+++ b/Habitica/src/com/habitrpg/android/habitica/widget/UpdateWidgetService.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgmobileapp.widget;
+package com.habitrpg.android.habitica.widget;
 
 import android.app.PendingIntent;
 import android.app.Service;
@@ -13,22 +13,18 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.widget.RemoteViews;
 
-import com.magicmicky.habitrpgmobileapp.APIHelper;
-import com.magicmicky.habitrpgmobileapp.HostConfig;
-import com.magicmicky.habitrpgmobileapp.MainActivity;
-import com.magicmicky.habitrpgmobileapp.R;
-import com.magicmicky.habitrpgmobileapp.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgmobileapp.prefs.PrefsActivity;
-import com.magicmicky.habitrpgmobileapp.userpicture.UserPicture;
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.MainActivity;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.prefs.PrefsActivity;
+import com.habitrpg.android.habitica.userpicture.UserPicture;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
-import retrofit.Callback;
-import retrofit.RetrofitError;
-import retrofit.client.Response;
-
 /**
  * The service that should update the simple widget
- * @see com.magicmicky.habitrpgmobileapp.widget.SimpleWidget
+ * @see com.habitrpg.android.habitica.widget.SimpleWidget
  * Created by Mickael on 01/11/13.
  */
 public class UpdateWidgetService extends Service implements HabitRPGUserCallback.OnUserReceived {