diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a764c2b5..055cae918 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
         </activity>
 
         <activity
-            android:name=".ui.show.ShowHabitActivity"
+            android:name=".ui.habits.show.ShowHabitActivity"
             android:label="@string/title_activity_show_habit">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -76,7 +76,7 @@
         </activity>
 
         <activity
-            android:name=".ui.IntroActivity"
+            android:name=".ui.intro.IntroActivity"
             android:label=""
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
 
@@ -89,7 +89,7 @@
         </activity>
 
         <activity
-            android:name=".ui.AboutActivity"
+            android:name=".ui.about.AboutActivity"
             android:label="@string/about">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
index a6fa0a01e..455d41a15 100644
--- a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
+++ b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
@@ -41,7 +41,7 @@ import org.isoron.uhabits.utils.ReminderUtils;
 import org.isoron.uhabits.models.Checkmark;
 import org.isoron.uhabits.models.Habit;
 import org.isoron.uhabits.tasks.BaseTask;
-import org.isoron.uhabits.ui.show.ShowHabitActivity;
+import org.isoron.uhabits.ui.habits.show.ShowHabitActivity;
 import org.isoron.uhabits.widgets.WidgetManager;
 
 import java.util.Date;
diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java
index dbf4b4f2b..43daf75ee 100644
--- a/app/src/main/java/org/isoron/uhabits/MainActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java
@@ -35,14 +35,14 @@ import org.isoron.uhabits.models.Checkmark;
 import org.isoron.uhabits.models.Habit;
 import org.isoron.uhabits.tasks.BaseTask;
 import org.isoron.uhabits.tasks.ProgressBar;
-import org.isoron.uhabits.ui.AboutActivity;
+import org.isoron.uhabits.ui.about.AboutActivity;
 import org.isoron.uhabits.ui.AndroidProgressBar;
 import org.isoron.uhabits.ui.BaseActivity;
-import org.isoron.uhabits.ui.IntroActivity;
-import org.isoron.uhabits.ui.list.ListHabitsFragment;
+import org.isoron.uhabits.ui.intro.IntroActivity;
+import org.isoron.uhabits.ui.habits.list.ListHabitsFragment;
 import org.isoron.uhabits.ui.settings.FilePickerDialog;
 import org.isoron.uhabits.ui.settings.SettingsActivity;
-import org.isoron.uhabits.ui.show.ShowHabitActivity;
+import org.isoron.uhabits.ui.habits.show.ShowHabitActivity;
 import org.isoron.uhabits.utils.FileUtils;
 import org.isoron.uhabits.utils.InterfaceUtils;
 import org.isoron.uhabits.widgets.WidgetManager;
diff --git a/app/src/main/java/org/isoron/uhabits/MainController.java b/app/src/main/java/org/isoron/uhabits/MainController.java
index d857d012f..2a89cc07d 100644
--- a/app/src/main/java/org/isoron/uhabits/MainController.java
+++ b/app/src/main/java/org/isoron/uhabits/MainController.java
@@ -25,6 +25,7 @@ import org.isoron.uhabits.tasks.ExportDBTask;
 import org.isoron.uhabits.tasks.ImportDataTask;
 import org.isoron.uhabits.tasks.ProgressBar;
 import org.isoron.uhabits.utils.DateUtils;
+import org.isoron.uhabits.utils.Preferences;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/AboutActivity.java b/app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/AboutActivity.java
rename to app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java
index a4a575a7f..dfebc387b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/AboutActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui;
+package org.isoron.uhabits.ui.about;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -27,6 +27,7 @@ import android.widget.TextView;
 
 import org.isoron.uhabits.BuildConfig;
 import org.isoron.uhabits.R;
+import org.isoron.uhabits.ui.BaseActivity;
 import org.isoron.uhabits.utils.InterfaceUtils;
 
 public class AboutActivity extends BaseActivity implements View.OnClickListener
diff --git a/app/src/main/java/org/isoron/uhabits/ui/edit/EditHabitDialogFragment.java b/app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialogFragment.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/edit/EditHabitDialogFragment.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialogFragment.java
index 1a21a8c9c..b70b2ce2b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/edit/EditHabitDialogFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialogFragment.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.edit;
+package org.isoron.uhabits.ui.habits.edit;
 
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/edit/HistoryEditorDialog.java b/app/src/main/java/org/isoron/uhabits/ui/habits/edit/HistoryEditorDialog.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/edit/HistoryEditorDialog.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/edit/HistoryEditorDialog.java
index d43bcfcbf..147d62f63 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/edit/HistoryEditorDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/edit/HistoryEditorDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.edit;
+package org.isoron.uhabits.ui.habits.edit;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/edit/WeekdayPickerDialog.java b/app/src/main/java/org/isoron/uhabits/ui/habits/edit/WeekdayPickerDialog.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/edit/WeekdayPickerDialog.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/edit/WeekdayPickerDialog.java
index e2de134d1..b6af16b01 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/edit/WeekdayPickerDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/edit/WeekdayPickerDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.edit;
+package org.isoron.uhabits.ui.habits.edit;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/list/HabitSelectionCallback.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/HabitSelectionCallback.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/list/HabitSelectionCallback.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/list/HabitSelectionCallback.java
index a065054b7..3617c15af 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/list/HabitSelectionCallback.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/HabitSelectionCallback.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.list;
+package org.isoron.uhabits.ui.habits.list;
 
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
@@ -35,7 +35,7 @@ import org.isoron.uhabits.commands.DeleteHabitsCommand;
 import org.isoron.uhabits.commands.UnarchiveHabitsCommand;
 import org.isoron.uhabits.models.Habit;
 import org.isoron.uhabits.ui.BaseActivity;
-import org.isoron.uhabits.ui.edit.EditHabitDialogFragment;
+import org.isoron.uhabits.ui.habits.edit.EditHabitDialogFragment;
 import org.isoron.uhabits.utils.ColorUtils;
 import org.isoron.uhabits.utils.InterfaceUtils;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsAdapter.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsAdapter.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsAdapter.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsAdapter.java
index dd0bf2810..223b7d471 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsAdapter.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsAdapter.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.list;
+package org.isoron.uhabits.ui.habits.list;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsController.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsController.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java
index dd56c4622..d6d125bde 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsController.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.list;
+package org.isoron.uhabits.ui.habits.list;
 
 public class ListHabitsController
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsFragment.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsFragment.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsFragment.java
index 111246108..43fe40eda 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsFragment.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.list;
+package org.isoron.uhabits.ui.habits.list;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -41,14 +41,14 @@ import android.widget.TextView;
 import com.mobeta.android.dslv.DragSortController;
 import com.mobeta.android.dslv.DragSortListView;
 
-import org.isoron.uhabits.Preferences;
+import org.isoron.uhabits.utils.Preferences;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.commands.Command;
 import org.isoron.uhabits.commands.ToggleRepetitionCommand;
 import org.isoron.uhabits.models.Habit;
 import org.isoron.uhabits.ui.BaseActivity;
 import org.isoron.uhabits.ui.HintManager;
-import org.isoron.uhabits.ui.edit.EditHabitDialogFragment;
+import org.isoron.uhabits.ui.habits.edit.EditHabitDialogFragment;
 import org.isoron.uhabits.utils.DateUtils;
 import org.isoron.uhabits.utils.InterfaceUtils;
 import org.isoron.uhabits.utils.InterfaceUtils.OnSavedListener;
@@ -130,6 +130,7 @@ public class ListHabitsFragment extends Fragment
 
     private void createListView(View view)
     {
+        listView = (DragSortListView) view.findViewById(R.id.listView);
         adapter = new ListHabitsAdapter(getActivity(), loader);
         adapter.setSelectedPositions(selectedPositions);
         adapter.setOnCheckmarkClickListener(this);
@@ -138,7 +139,6 @@ public class ListHabitsFragment extends Fragment
         DragSortListView.DragListener dragListener = new HabitsDragListener();
         DragSortController dragSortController = new HabitsDragSortController();
 
-        listView = (DragSortListView) view.findViewById(R.id.listView);
         listView.setAdapter(adapter);
         listView.setOnItemClickListener(this);
         listView.setOnItemLongClickListener(this);
diff --git a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsHelper.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsHelper.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsHelper.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsHelper.java
index 71411f383..3c74153ef 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsHelper.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.list;
+package org.isoron.uhabits.ui.habits.list;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsLoader.java b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsLoader.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsLoader.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsLoader.java
index baed5b504..12f2331ab 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsLoader.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsLoader.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.list;
+package org.isoron.uhabits.ui.habits.list;
 
 import org.isoron.uhabits.utils.DateUtils;
 import org.isoron.uhabits.models.Habit;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitActivity.java b/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitActivity.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java
index 38a6d3d8e..a34a61fe4 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.show;
+package org.isoron.uhabits.ui.habits.show;
 
 import android.content.ContentUris;
 import android.net.Uri;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitFragment.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitFragment.java
rename to app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitFragment.java
index 68873a6e5..630d47fcb 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitFragment.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.show;
+package org.isoron.uhabits.ui.habits.show;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -36,8 +36,8 @@ import android.widget.TextView;
 import org.isoron.uhabits.HabitBroadcastReceiver;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.commands.Command;
-import org.isoron.uhabits.ui.edit.EditHabitDialogFragment;
-import org.isoron.uhabits.ui.edit.HistoryEditorDialog;
+import org.isoron.uhabits.ui.habits.edit.EditHabitDialogFragment;
+import org.isoron.uhabits.ui.habits.edit.HistoryEditorDialog;
 import org.isoron.uhabits.utils.ColorUtils;
 import org.isoron.uhabits.utils.DateUtils;
 import org.isoron.uhabits.utils.ReminderUtils;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/IntroActivity.java b/app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/IntroActivity.java
rename to app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java
index f58298186..1b0229633 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/IntroActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui;
+package org.isoron.uhabits.ui.intro;
 
 import android.graphics.Color;
 import android.os.Bundle;
diff --git a/app/src/main/java/org/isoron/uhabits/Preferences.java b/app/src/main/java/org/isoron/uhabits/utils/Preferences.java
similarity index 93%
rename from app/src/main/java/org/isoron/uhabits/Preferences.java
rename to app/src/main/java/org/isoron/uhabits/utils/Preferences.java
index f7b8f4f26..d9d216676 100644
--- a/app/src/main/java/org/isoron/uhabits/Preferences.java
+++ b/app/src/main/java/org/isoron/uhabits/utils/Preferences.java
@@ -17,12 +17,16 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits;
+package org.isoron.uhabits.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import org.isoron.uhabits.BuildConfig;
+import org.isoron.uhabits.HabitsApplication;
+import org.isoron.uhabits.R;
+
 public class Preferences
 {
     private static Preferences singleton;
diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index cbca604bf..0643359de 100644
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -22,7 +22,7 @@
     style="@style/dialogForm"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.edit.EditHabitDialogFragment"
+    tools:context=".ui.habits.edit.EditHabitDialogFragment"
     tools:ignore="MergeRootFrame">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/list_habits_activity.xml b/app/src/main/res/layout/list_habits_activity.xml
index bd24b8154..6c0d3a643 100644
--- a/app/src/main/res/layout/list_habits_activity.xml
+++ b/app/src/main/res/layout/list_habits_activity.xml
@@ -33,7 +33,7 @@
 
     <fragment
         android:id="@+id/fragment1"
-        android:name="org.isoron.uhabits.ui.list.ListHabitsFragment"
+        android:name="org.isoron.uhabits.ui.habits.list.ListHabitsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
diff --git a/app/src/main/res/layout/show_habit.xml b/app/src/main/res/layout/show_habit.xml
index 8b767279b..4a4257703 100644
--- a/app/src/main/res/layout/show_habit.xml
+++ b/app/src/main/res/layout/show_habit.xml
@@ -31,7 +31,7 @@
     <LinearLayout
         style="@style/CardList"
         android:clipToPadding="false"
-        tools:context=".ui.show.ShowHabitActivity">
+        tools:context=".ui.habits.show.ShowHabitActivity">
 
         <LinearLayout
             android:id="@+id/subtitle"
diff --git a/app/src/main/res/layout/show_habit_activity.xml b/app/src/main/res/layout/show_habit_activity.xml
index e9321eb46..d5df5b47b 100644
--- a/app/src/main/res/layout/show_habit_activity.xml
+++ b/app/src/main/res/layout/show_habit_activity.xml
@@ -24,7 +24,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.show.ShowHabitActivity"
+    tools:context=".ui.habits.show.ShowHabitActivity"
     tools:ignore="MergeRootFrame"
     tools:menu="show_habit_activity_menu,show_habit_fragment_menu">
 
@@ -35,7 +35,7 @@
 
     <fragment
         android:id="@+id/fragment2"
-        android:name="org.isoron.uhabits.ui.show.ShowHabitFragment"
+        android:name="org.isoron.uhabits.ui.habits.show.ShowHabitFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"