diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
index 9894843d0..671f2f7f1 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
@@ -25,8 +25,8 @@ import android.support.annotation.*;
 import android.view.*;
 import android.widget.*;
 
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import java.io.*;
 
diff --git a/app/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java b/app/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
index 39234dc70..05c2c85c6 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
@@ -24,7 +24,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/app/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java b/app/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
index 83b8579c2..46b3c03c3 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
@@ -23,7 +23,7 @@ import android.os.*;
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/FrequencyChartTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/common/views/FrequencyChartTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
index 2d21a6dd1..2bdf05438 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/FrequencyChartTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/HistoryChartTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
similarity index 98%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/common/views/HistoryChartTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
index 9a6c99640..05a2c5a06 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/HistoryChartTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/RingViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/common/views/RingViewTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
index 771e1d17c..6dcf84081 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/RingViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.graphics.*;
 import android.support.test.runner.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/ScoreChartTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
similarity index 98%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/common/views/ScoreChartTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
index b56bd5704..fa0f7f023 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/ScoreChartTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/StreakChartTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/common/views/StreakChartTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
index 3ca002117..47b9e7c04 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/common/views/StreakChartTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkButtonViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java
similarity index 98%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkButtonViewTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java
index b55eefce1..0875f72d5 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkButtonViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkPanelViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java
similarity index 98%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkPanelViewTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java
index 878dc5c9f..2d1fada47 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkPanelViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/HintViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
similarity index 94%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/HintViewTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
index 8e73673e2..0427c07a0 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/list/views/HintViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/FrequencyCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
similarity index 96%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/FrequencyCardTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
index 25d7b2115..adcae2b9e 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/FrequencyCardTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/HistoryCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
similarity index 96%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/HistoryCardTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
index 767306c53..a4e4c8860 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/HistoryCardTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/OverviewCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
similarity index 96%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/OverviewCardTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
index 8dc3e344c..25bfc950f 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/OverviewCardTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/ScoreCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
similarity index 96%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/ScoreCardTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
index 8bbe942e1..8b229d7f5 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/ScoreCardTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/StreakCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
similarity index 96%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/StreakCardTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
index 684b039be..1350b65dc 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/StreakCardTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/SubtitleCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
similarity index 96%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/SubtitleCardTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
index 42b8f3ab1..09cfb02b2 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/habits/show/views/SubtitleCardTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/CheckmarkWidgetTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/CheckmarkWidgetTest.java
similarity index 98%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/widgets/CheckmarkWidgetTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/widgets/CheckmarkWidgetTest.java
index 56ad820d1..624f1c976 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/CheckmarkWidgetTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/CheckmarkWidgetTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.activities.widgets;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/FrequencyWidgetTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/FrequencyWidgetTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/widgets/FrequencyWidgetTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/widgets/FrequencyWidgetTest.java
index 71492eb85..bba0cafe1 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/FrequencyWidgetTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/FrequencyWidgetTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.activities.widgets;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/HistoryWidgetTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/HistoryWidgetTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/widgets/HistoryWidgetTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/widgets/HistoryWidgetTest.java
index a1daf7d64..a3f8a86d7 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/HistoryWidgetTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/HistoryWidgetTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.activities.widgets;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/ScoreWidgetTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/ScoreWidgetTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/widgets/ScoreWidgetTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/widgets/ScoreWidgetTest.java
index 3a0ce96dd..010273d39 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/ScoreWidgetTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/ScoreWidgetTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.activities.widgets;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/StreakWidgetTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/StreakWidgetTest.java
similarity index 97%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/widgets/StreakWidgetTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/activities/widgets/StreakWidgetTest.java
index e8bf18f44..2ca64757b 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/StreakWidgetTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/activities/widgets/StreakWidgetTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.activities.widgets;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/views/CheckmarkWidgetViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
similarity index 98%
rename from app/src/androidTest/java/org/isoron/uhabits/ui/widgets/views/CheckmarkWidgetViewTest.java
rename to app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
index fe64291af..7f7a955ea 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/ui/widgets/views/CheckmarkWidgetViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets.views;
+package org.isoron.uhabits.widgets.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a72f836da..b3327aa52 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
         </activity>
 
         <activity
-            android:name=".ui.habits.show.ShowHabitActivity"
+            android:name=".activities.habits.show.ShowHabitActivity"
             android:label="@string/title_activity_show_habit">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -68,7 +68,7 @@
         </activity>
 
         <activity
-            android:name=".ui.settings.SettingsActivity"
+            android:name=".activities.settings.SettingsActivity"
             android:label="@string/settings">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -76,12 +76,12 @@
         </activity>
 
         <activity
-            android:name=".ui.intro.IntroActivity"
+            android:name=".activities.intro.IntroActivity"
             android:label=""
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
 
         <activity
-            android:name=".ui.widgets.HabitPickerDialog"
+            android:name=".widgets.HabitPickerDialog"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
@@ -89,7 +89,7 @@
         </activity>
 
         <activity
-            android:name=".ui.about.AboutActivity"
+            android:name=".activities.about.AboutActivity"
             android:label="@string/about">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/org/isoron/uhabits/AppComponent.java b/app/src/main/java/org/isoron/uhabits/AppComponent.java
index 770a3271d..1f6cb5db4 100644
--- a/app/src/main/java/org/isoron/uhabits/AppComponent.java
+++ b/app/src/main/java/org/isoron/uhabits/AppComponent.java
@@ -26,8 +26,8 @@ import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.receivers.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/HabitsApplication.java b/app/src/main/java/org/isoron/uhabits/HabitsApplication.java
index 009f240cf..7d0f6fcee 100644
--- a/app/src/main/java/org/isoron/uhabits/HabitsApplication.java
+++ b/app/src/main/java/org/isoron/uhabits/HabitsApplication.java
@@ -25,8 +25,8 @@ import android.support.annotation.*;
 
 import com.activeandroid.*;
 
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import java.io.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java
index ba7b6da06..57dc9cbdd 100644
--- a/app/src/main/java/org/isoron/uhabits/MainActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits;
 
-import org.isoron.uhabits.ui.habits.list.ListHabitsActivity;
+import org.isoron.uhabits.activities.habits.list.ListHabitsActivity;
 
 /**
  * Application that starts upon clicking the launcher icon.
diff --git a/app/src/main/java/org/isoron/uhabits/ui/ActivityComponent.java b/app/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java
similarity index 90%
rename from app/src/main/java/org/isoron/uhabits/ui/ActivityComponent.java
rename to app/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java
index be35b4960..bc285549c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/ActivityComponent.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui;
+package org.isoron.uhabits.activities;
 
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 
 import dagger.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/ActivityContext.java b/app/src/main/java/org/isoron/uhabits/activities/ActivityContext.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/ActivityContext.java
rename to app/src/main/java/org/isoron/uhabits/activities/ActivityContext.java
index 9ea1b7de0..c75c28dae 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/ActivityContext.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/ActivityContext.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.activities;
 
 import java.lang.annotation.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/ActivityModule.java b/app/src/main/java/org/isoron/uhabits/activities/ActivityModule.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/ActivityModule.java
rename to app/src/main/java/org/isoron/uhabits/activities/ActivityModule.java
index 857ab6a2a..b55fc2ab0 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/ActivityModule.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/ActivityModule.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.activities;
 
 import android.content.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/ActivityScope.java b/app/src/main/java/org/isoron/uhabits/activities/ActivityScope.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/ActivityScope.java
rename to app/src/main/java/org/isoron/uhabits/activities/ActivityScope.java
index 98f434180..37cae6e5b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/ActivityScope.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/ActivityScope.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.activities;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java b/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java
rename to app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
index 7570b6658..cd4fdbb6b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.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.activities;
 
 import android.content.*;
 import android.os.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseMenu.java b/app/src/main/java/org/isoron/uhabits/activities/BaseMenu.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/BaseMenu.java
rename to app/src/main/java/org/isoron/uhabits/activities/BaseMenu.java
index 00ed8f6fe..f9d7bf077 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseMenu.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.activities;
 
 import android.support.annotation.*;
 import android.view.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseRootView.java b/app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/BaseRootView.java
rename to app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java
index a1363b285..f1586c29f 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseRootView.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.activities;
 
 import android.content.*;
 import android.os.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseScreen.java b/app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/BaseScreen.java
rename to app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java
index d16a93cbe..5e7d33492 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseScreen.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseScreen.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.activities;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseSelectionMenu.java b/app/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/BaseSelectionMenu.java
rename to app/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.java
index eb5595afc..a5c7f5cca 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseSelectionMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.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.activities;
 
 import android.support.annotation.*;
 import android.support.v7.view.ActionMode;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseSystem.java b/app/src/main/java/org/isoron/uhabits/activities/BaseSystem.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/BaseSystem.java
rename to app/src/main/java/org/isoron/uhabits/activities/BaseSystem.java
index ed14fe1f6..59cf1c33f 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseSystem.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseSystem.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.activities;
 
 import android.content.*;
 import android.os.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java b/app/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java
rename to app/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
index 843a7e9a6..ee39d9936 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.about;
+package org.isoron.uhabits.activities.about;
 
 import android.content.*;
 import android.net.*;
@@ -26,7 +26,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 /**
diff --git a/app/src/main/java/org/isoron/uhabits/ui/about/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/about/package-info.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/about/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/about/package-info.java
index 483cc1927..e519806ab 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/about/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/about/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides activity that shows information about the app.
  */
-package org.isoron.uhabits.ui.about;
\ No newline at end of file
+package org.isoron.uhabits.activities.about;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/ColorPickerDialog.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/common/dialogs/ColorPickerDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
index ce1135e56..9da801ccd 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/ColorPickerDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/ConfirmDeleteDialog.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/common/dialogs/ConfirmDeleteDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
index 29ffcd9d4..b86ed2f25 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/ConfirmDeleteDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 import android.support.v7.app.*;
@@ -25,7 +25,7 @@ import android.support.v7.app.*;
 import com.google.auto.factory.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 import butterknife.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/DialogFactory.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/DialogFactory.java
similarity index 90%
rename from app/src/main/java/org/isoron/uhabits/ui/common/dialogs/DialogFactory.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/dialogs/DialogFactory.java
index 808e8051c..69daa194f 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/DialogFactory.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/DialogFactory.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/FilePickerDialog.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/FilePickerDialog.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/common/dialogs/FilePickerDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/dialogs/FilePickerDialog.java
index 4ee35ac79..a2cca7bbc 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/FilePickerDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/FilePickerDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -28,7 +28,7 @@ import android.widget.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/HistoryEditorDialog.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/common/dialogs/HistoryEditorDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
index c3c336e19..1544b381a 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/HistoryEditorDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.app.*;
 import android.content.*;
@@ -30,7 +30,7 @@ import android.util.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class HistoryEditorDialog extends AppCompatDialogFragment
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/WeekdayPickerDialog.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/common/dialogs/WeekdayPickerDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
index ca0fee0f3..792e403f7 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/dialogs/WeekdayPickerDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.app.*;
 import android.content.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/FrequencyChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/FrequencyChart.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
index 81548342a..7554c19bb 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/FrequencyChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/HabitChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/HabitChart.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
index 1b31f4c38..cd74cf15c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/HabitChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import org.isoron.uhabits.models.Habit;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/HistoryChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/HistoryChart.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
index 3c0870126..680315b3d 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/HistoryChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/RingView.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/RingView.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
index d2634e3a4..e093a9f2b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/RingView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/ScoreChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/ScoreChart.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
index b8c32b906..902959684 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/ScoreChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/ScrollableChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/ScrollableChart.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
index 9678630e9..a762ecf86 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/ScrollableChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.animation.*;
 import android.content.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/StreakChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/StreakChart.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
index ebef49674..155557ea2 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/StreakChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/common/views/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/package-info.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/common/views/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/common/views/package-info.java
index 4c5fb6c16..1d50f26f0 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/common/views/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides views that are used across the app, such as RingView.
  */
-package org.isoron.uhabits.ui.common.views;
\ No newline at end of file
+package org.isoron.uhabits.activities.common.views;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/BaseDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/edit/BaseDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
index 00ec1ace2..01fc46761 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/BaseDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;
 
 import android.app.*;
 import android.os.*;
@@ -32,8 +32,8 @@ import com.android.datetimepicker.time.TimePickerDialog;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/BaseDialogHelper.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/edit/BaseDialogHelper.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java
index bca53f0f2..78e69c6d4 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/BaseDialogHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;
 
 import android.annotation.*;
 import android.support.v4.app.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/CreateHabitDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/CreateHabitDialog.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/edit/CreateHabitDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/edit/CreateHabitDialog.java
index 6bfa8d13a..a78fe6f82 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/CreateHabitDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/CreateHabitDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;
 
 import com.google.auto.factory.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialog.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
index 19b068c5b..4679157e9 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;
 
 import android.os.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/package-info.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/edit/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/edit/package-info.java
index b5d29a4f4..3d6e4e626 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/edit/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides dialogs for editing habits and related classes.
  */
-package org.isoron.uhabits.ui.habits.edit;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.edit;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsActivity.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java
similarity index 93%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsActivity.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java
index e0140e1ad..00601e0e3 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.os.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 /**
  * Activity that allows the user to see and modify the list of habits.
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsComponent.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java
similarity index 89%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsComponent.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java
index f6a8e446a..115982381 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsComponent.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 import dagger.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
index fc0fe6231..8e3bd211a 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.os.*;
 import android.support.annotation.*;
@@ -26,11 +26,11 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.widgets.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsMenu.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsMenu.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
index 8fcf76b69..60694c68f 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsRootView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsRootView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
index 57729165a..af66027d0 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.content.*;
 import android.content.res.*;
@@ -28,10 +28,10 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsScreen.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsScreen.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java
index d517c2927..0bbe80e5a 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsScreen.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.content.*;
 import android.os.*;
@@ -28,10 +28,10 @@ import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
-import org.isoron.uhabits.ui.common.dialogs.ColorPickerDialog.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialog.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.utils.*;
 
 import java.io.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsSelectionMenu.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsSelectionMenu.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java
index 5c40c3576..9543fe352 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsSelectionMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.support.annotation.*;
 import android.view.*;
@@ -25,9 +25,9 @@ import android.view.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 import java.util.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/CheckmarkButtonController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/CheckmarkButtonController.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
index 570bd036c..7cc7ccde0 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/CheckmarkButtonController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkButtonController
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
similarity index 92%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardController.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
index f62fca8a2..01e2b4643 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.Habit;
-import org.isoron.uhabits.ui.habits.list.views.HabitCardView;
+import org.isoron.uhabits.activities.habits.list.views.HabitCardView;
 
 public class HabitCardController implements HabitCardView.Controller
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardListController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardListController.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
index c5d375982..d710c3572 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardListController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 
 /**
  * Controller responsible for receiving and processing the events generated by a
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java
similarity index 88%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java
index 46e9e09ce..c5b148812 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/controllers/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java
@@ -18,6 +18,6 @@
  */
 
 /**
- * Provides controllers that are specific for {@link org.isoron.uhabits.ui.habits.list.ListHabitsActivity}.
+ * Provides controllers that are specific for {@link org.isoron.uhabits.activities.habits.list.ListHabitsActivity}.
  */
-package org.isoron.uhabits.ui.habits.list.controllers;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.list.controllers;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
index a33e4e5cb..a33241b78 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapter.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import android.support.annotation.*;
 import android.support.v7.widget.*;
 import android.view.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 
 import java.util.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java
index 9687d950e..0715f7ee0 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCache.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import android.support.annotation.*;
 
@@ -25,7 +25,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardViewHolder.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardViewHolder.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardViewHolder.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardViewHolder.java
index f64013ba3..494801e48 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HabitCardViewHolder.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardViewHolder.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import android.support.v7.widget.*;
 import android.view.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HintList.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HintList.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java
index a8f4c66d0..f70ee2e85 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/HintList.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import android.support.annotation.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/package-info.java
similarity index 89%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/model/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/model/package-info.java
index 06b94b85b..755ffcaa1 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/model/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/package-info.java
@@ -18,6 +18,6 @@
  */
 
 /**
- * Provides models that are specific for {@link org.isoron.uhabits.ui.habits.list.ListHabitsActivity}.
+ * Provides models that are specific for {@link org.isoron.uhabits.activities.habits.list.ListHabitsActivity}.
  */
-package org.isoron.uhabits.ui.habits.list.model;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.list.model;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/package-info.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/package-info.java
index 2d3cc559b..1a39e29de 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides acitivity for listing habits and related classes.
  */
-package org.isoron.uhabits.ui.habits.list;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.list;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkButtonView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkButtonView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
index 5aadc6db7..69356f1ed 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkButtonView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.graphics.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkPanelView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkPanelView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
index ee2afb264..7068201be 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/CheckmarkPanelView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkPanelView extends LinearLayout
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HabitCardListView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HabitCardListView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
index bec2e62ed..9b21b8d00 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HabitCardListView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,8 +27,8 @@ import android.util.*;
 import android.view.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 import java.util.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HabitCardView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HabitCardView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
index 6e7780ef9..b06ec0d60 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HabitCardView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.annotation.*;
 import android.content.*;
@@ -29,7 +29,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HeaderView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HeaderView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
index 565c724cf..534eff387 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HeaderView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HintView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HintView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
index fc3f7a570..f083b6fd2 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/list/views/HintView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
@@ -29,7 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.habits.list.model.HintList;
+import org.isoron.uhabits.activities.habits.list.model.HintList;
 
 import java.util.Random;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
index f6bf27bb1..5265e6953 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.content.*;
 import android.net.*;
@@ -26,7 +26,7 @@ import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 /**
  * Activity that allows the user to see more information about a single habit.
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitController.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java
index aa445bf8d..bb20968df 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 
 public class ShowHabitController
     implements ShowHabitRootView.Controller, HistoryEditorDialog.Controller
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitRootView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitRootView.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
index fc7386929..cbe271a08 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -25,8 +25,8 @@ import android.support.v7.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.show.views.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.show.views.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitScreen.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
similarity index 90%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitScreen.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
index 7a4f669e1..3997ad9d6 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitScreen.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 
 public class ShowHabitScreen extends BaseScreen
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitsMenu.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitsMenu.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
index 41b37e043..278207506 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitsMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 public class ShowHabitsMenu extends BaseMenu
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/package-info.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/package-info.java
index 3cdcf42b8..ca132a6c7 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/package-info.java
@@ -21,4 +21,4 @@
  * Provides activity that displays detailed habit information and related
  * classes.
  */
-package org.isoron.uhabits.ui.habits.show;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.show;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/FrequencyCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/FrequencyCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
index dfba4776f..3d6c56c98 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/FrequencyCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.util.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/HabitCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/HabitCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
index 625175d79..62b501f0c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/HabitCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/HistoryCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/HistoryCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
index 39866ded7..ae2f92553 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/HistoryCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,7 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/OverviewCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/OverviewCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
index 201cdf570..ad8d0cd68 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/OverviewCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,7 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/ScoreCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/ScoreCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
index 3ab06e4cc..a477612e6 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/ScoreCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,7 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/StreakCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/StreakCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
index d32d320c1..fba78a1e0 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/StreakCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.util.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/SubtitleCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/SubtitleCard.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
index 0a9487f59..4d033473e 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/SubtitleCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.annotation.*;
 import android.content.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/package-info.java
similarity index 87%
rename from app/src/main/java/org/isoron/uhabits/ui/habits/show/views/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/habits/show/views/package-info.java
index 5442e7bcf..f9fc65e4b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/habits/show/views/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/package-info.java
@@ -19,6 +19,6 @@
 
 /**
  * Provides custom views that are used primarily on {@link
- * org.isoron.uhabits.ui.habits.show.ShowHabitActivity}.
+ * org.isoron.uhabits.activities.habits.show.ShowHabitActivity}.
  */
-package org.isoron.uhabits.ui.habits.show.views;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.show.views;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java b/app/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java
rename to app/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java
index 19ce9d321..4fe80138c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java
@@ -17,9 +17,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.intro;
+package org.isoron.uhabits.activities.intro;
 
-import android.content.*;
 import android.graphics.*;
 import android.os.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/intro/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/intro/package-info.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/intro/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/intro/package-info.java
index 200ce960c..4023d1b94 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/intro/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/intro/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides activity that introduces app to the user and related classes.
  */
-package org.isoron.uhabits.ui.intro;
\ No newline at end of file
+package org.isoron.uhabits.activities.intro;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/package-info.java
similarity index 90%
rename from app/src/main/java/org/isoron/uhabits/ui/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/package-info.java
index 6eb8588d5..abc95467c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/package-info.java
@@ -18,6 +18,6 @@
  */
 
 /**
- * Provides classes for the Android user interface.
+ * Provides classes for the Android activites.
  */
-package org.isoron.uhabits.ui;
\ No newline at end of file
+package org.isoron.uhabits.activities;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/ui/settings/SettingsActivity.java b/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
similarity index 93%
rename from app/src/main/java/org/isoron/uhabits/ui/settings/SettingsActivity.java
rename to app/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
index 01173a677..de1120278 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/settings/SettingsActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.settings;
+package org.isoron.uhabits.activities.settings;
 
 import android.os.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 /**
diff --git a/app/src/main/java/org/isoron/uhabits/ui/settings/SettingsFragment.java b/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/settings/SettingsFragment.java
rename to app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
index 85cf523b3..680f2720f 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.settings;
+package org.isoron.uhabits.activities.settings;
 
 import android.app.backup.*;
 import android.content.*;
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.v7.preference.*;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.habits.list.*;
+import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.utils.*;
 
 public class SettingsFragment extends PreferenceFragmentCompat
diff --git a/app/src/main/java/org/isoron/uhabits/ui/settings/package-info.java b/app/src/main/java/org/isoron/uhabits/activities/settings/package-info.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/settings/package-info.java
rename to app/src/main/java/org/isoron/uhabits/activities/settings/package-info.java
index 28a65b5ea..73ed9c7a1 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/settings/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/settings/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides activity for changing the settings.
  */
-package org.isoron.uhabits.ui.settings;
\ No newline at end of file
+package org.isoron.uhabits.activities.settings;
\ No newline at end of file
diff --git a/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java b/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
index 19a222bbe..561c512f8 100644
--- a/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
+++ b/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
@@ -24,10 +24,10 @@ import android.net.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.about.*;
-import org.isoron.uhabits.ui.habits.show.*;
-import org.isoron.uhabits.ui.intro.*;
-import org.isoron.uhabits.ui.settings.*;
+import org.isoron.uhabits.activities.about.*;
+import org.isoron.uhabits.activities.habits.show.*;
+import org.isoron.uhabits.activities.intro.*;
+import org.isoron.uhabits.activities.settings.*;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/utils/WidgetUtils.java b/app/src/main/java/org/isoron/uhabits/utils/WidgetUtils.java
index c4348f38e..45b992205 100644
--- a/app/src/main/java/org/isoron/uhabits/utils/WidgetUtils.java
+++ b/app/src/main/java/org/isoron/uhabits/utils/WidgetUtils.java
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.annotation.*;
 import android.widget.*;
 
-import org.isoron.uhabits.ui.widgets.*;
+import org.isoron.uhabits.widgets.*;
 
 import static android.appwidget.AppWidgetManager.*;
 import static android.os.Build.VERSION.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/BaseWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/BaseWidget.java
rename to app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
index 9f400bde3..f5d63d75b 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/BaseWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
index 29d462c16..3abe71c0d 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -27,7 +27,6 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
 
 import static android.os.Build.VERSION.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/CheckmarkWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java
similarity index 96%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/CheckmarkWidget.java
rename to app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java
index 14047809c..b7712cd61 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/CheckmarkWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
@@ -26,7 +26,7 @@ import android.view.*;
 
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.views.*;
+import org.isoron.uhabits.widgets.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkWidget extends BaseWidget
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
index c574d9c2e..cd3fe8e62 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
@@ -22,7 +22,6 @@ import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.*;
 
 public class CheckmarkWidgetProvider extends BaseWidgetProvider
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/FrequencyWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/FrequencyWidget.java
rename to app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java
index 0fe977538..3cb18e7ba 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/FrequencyWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
@@ -26,8 +26,8 @@ import android.view.*;
 
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
-import org.isoron.uhabits.ui.widgets.views.*;
+import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.widgets.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class FrequencyWidget extends BaseWidget
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java
index ab7d1b8bc..2d3e5fce9 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java
@@ -23,7 +23,6 @@ import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.*;
 
 public class FrequencyWidgetProvider extends BaseWidgetProvider
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/HabitPickerDialog.java b/app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/HabitPickerDialog.java
rename to app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
index cff3d74ed..0aa0cebee 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/HabitPickerDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/HistoryWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java
similarity index 94%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/HistoryWidget.java
rename to app/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java
index d4ac726b2..c81d99dfb 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/HistoryWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
@@ -26,8 +26,8 @@ import android.view.*;
 
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
-import org.isoron.uhabits.ui.widgets.views.*;
+import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.widgets.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class HistoryWidget extends BaseWidget
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java
index 23ad2340e..6f377ca3a 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java
@@ -22,7 +22,6 @@ import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.*;
 
 public class HistoryWidgetProvider extends BaseWidgetProvider
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/ScoreWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
similarity index 93%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/ScoreWidget.java
rename to app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
index aded2f02a..f55655a11 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/ScoreWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
@@ -27,9 +27,9 @@ import android.view.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
-import org.isoron.uhabits.ui.habits.show.views.*;
-import org.isoron.uhabits.ui.widgets.views.*;
+import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.activities.habits.show.views.*;
+import org.isoron.uhabits.widgets.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java
index 97167bc85..002be7f17 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java
@@ -22,7 +22,6 @@ import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.*;
 
 public class ScoreWidgetProvider extends BaseWidgetProvider
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/StreakWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/StreakWidget.java
rename to app/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java
index afc536a97..d5fe07a76 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/StreakWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.app.*;
 import android.content.*;
@@ -27,8 +27,8 @@ import android.view.ViewGroup.*;
 
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
-import org.isoron.uhabits.ui.widgets.views.*;
+import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.widgets.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java
index 22f0baee1..211246eb3 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java
@@ -22,7 +22,6 @@ import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.widgets.*;
 
 public class StreakWidgetProvider extends BaseWidgetProvider
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/WidgetDimensions.java b/app/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/WidgetDimensions.java
rename to app/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.java
index 28285e34b..5c88a2114 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/WidgetDimensions.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 public class WidgetDimensions
 {
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/WidgetUpdater.java b/app/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/WidgetUpdater.java
rename to app/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java
index 89cb3adf1..81928f917 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/WidgetUpdater.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.widgets;
 
 import android.appwidget.*;
 import android.content.*;
@@ -25,7 +25,6 @@ import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.widgets.*;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/CheckmarkWidgetView.java b/app/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/views/CheckmarkWidgetView.java
rename to app/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
index 3e8fe2138..b27d4f246 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/CheckmarkWidgetView.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets.views;
+package org.isoron.uhabits.widgets.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkWidgetView extends HabitWidgetView
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/GraphWidgetView.java b/app/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/views/GraphWidgetView.java
rename to app/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
index 56ab7b05b..e11fda10f 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/GraphWidgetView.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets.views;
+package org.isoron.uhabits.widgets.views;
 
 import android.content.*;
 import android.support.annotation.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/HabitWidgetView.java b/app/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
similarity index 98%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/views/HabitWidgetView.java
rename to app/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
index a8b698f3c..02f7cf671 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/HabitWidgetView.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets.views;
+package org.isoron.uhabits.widgets.views;
 
 import android.content.*;
 import android.graphics.*;
diff --git a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/package-info.java b/app/src/main/java/org/isoron/uhabits/widgets/views/package-info.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/ui/widgets/views/package-info.java
rename to app/src/main/java/org/isoron/uhabits/widgets/views/package-info.java
index 7e26dce73..2fbf2799c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/widgets/views/package-info.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/views/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides views that are specific for the home-screen widgets.
  */
-package org.isoron.uhabits.ui.widgets.views;
\ No newline at end of file
+package org.isoron.uhabits.widgets.views;
\ No newline at end of file
diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index cf76d7f43..a8d4b0b95 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.habits.edit.BaseDialog"
+    tools:context=".activities.habits.edit.BaseDialog"
     tools:ignore="MergeRootFrame">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/list_habits.xml b/app/src/main/res/layout/list_habits.xml
index a85a024d1..239795117 100644
--- a/app/src/main/res/layout/list_habits.xml
+++ b/app/src/main/res/layout/list_habits.xml
@@ -30,14 +30,14 @@
         app:popupTheme="?toolbarPopupTheme"
         android:layout_alignParentTop="true"/>
 
-    <org.isoron.uhabits.ui.habits.list.views.HeaderView
+    <org.isoron.uhabits.activities.habits.list.views.HeaderView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
         android:id="@+id/header"
         style="@style/ListHabits.Header"/>
 
-    <org.isoron.uhabits.ui.habits.list.views.HabitCardListView
+    <org.isoron.uhabits.activities.habits.list.views.HabitCardListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -77,7 +77,7 @@
         android:visibility="gone"
         />
 
-    <org.isoron.uhabits.ui.habits.list.views.HintView
+    <org.isoron.uhabits.activities.habits.list.views.HintView
         android:id="@+id/hintView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_habits_card.xml b/app/src/main/res/layout/list_habits_card.xml
index 3d2ecc88e..7b8d0f54d 100644
--- a/app/src/main/res/layout/list_habits_card.xml
+++ b/app/src/main/res/layout/list_habits_card.xml
@@ -29,7 +29,7 @@
         style="@style/ListHabits.HabitCard"
         android:layout_width="match_parent">
 
-        <org.isoron.uhabits.ui.common.views.RingView
+        <org.isoron.uhabits.activities.common.views.RingView
             android:id="@+id/scoreRing"
             android:layout_width="15dp"
             android:layout_height="15dp"
@@ -42,7 +42,7 @@
             android:id="@+id/label"
             style="@style/ListHabits.Label"/>
 
-        <org.isoron.uhabits.ui.habits.list.views.CheckmarkPanelView
+        <org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
             android:id="@+id/checkmarkPanel"
             style="@style/ListHabits.CheckmarkPanel"/>
 
diff --git a/app/src/main/res/layout/list_habits_preview.xml b/app/src/main/res/layout/list_habits_preview.xml
index 87250848d..5ea6eb697 100644
--- a/app/src/main/res/layout/list_habits_preview.xml
+++ b/app/src/main/res/layout/list_habits_preview.xml
@@ -30,7 +30,7 @@
         app:popupTheme="?toolbarPopupTheme"
         android:layout_alignParentTop="true"/>
 
-    <org.isoron.uhabits.ui.habits.list.views.HeaderView
+    <org.isoron.uhabits.activities.habits.list.views.HeaderView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
@@ -48,23 +48,23 @@
         android:layout_below="@id/header"
         android:orientation="vertical">
 
-        <org.isoron.uhabits.ui.habits.list.views.HabitCardView
+        <org.isoron.uhabits.activities.habits.list.views.HabitCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <org.isoron.uhabits.ui.habits.list.views.HabitCardView
+        <org.isoron.uhabits.activities.habits.list.views.HabitCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <org.isoron.uhabits.ui.habits.list.views.HabitCardView
+        <org.isoron.uhabits.activities.habits.list.views.HabitCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <org.isoron.uhabits.ui.habits.list.views.HabitCardView
+        <org.isoron.uhabits.activities.habits.list.views.HabitCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <org.isoron.uhabits.ui.habits.list.views.HabitCardView
+        <org.isoron.uhabits.activities.habits.list.views.HabitCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
@@ -109,7 +109,7 @@
         android:visibility="gone"
         />
 
-    <org.isoron.uhabits.ui.habits.list.views.HintView
+    <org.isoron.uhabits.activities.habits.list.views.HintView
         android:id="@+id/hintView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 210bcf43c..16d9003df 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -23,7 +23,7 @@
              android:id="@+id/container"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             tools:context=".ui.settings.SettingsActivity"
+             tools:context=".activities.settings.SettingsActivity"
              tools:ignore="MergeRootFrame">
 
     <android.support.v7.widget.Toolbar
@@ -33,7 +33,7 @@
 
     <fragment
         android:id="@+id/fragment"
-        android:name="org.isoron.uhabits.ui.settings.SettingsFragment"
+        android:name="org.isoron.uhabits.activities.settings.SettingsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/show_habit_frequency.xml b/app/src/main/res/layout/show_habit_frequency.xml
index 057ee1018..5b9958973 100644
--- a/app/src/main/res/layout/show_habit_frequency.xml
+++ b/app/src/main/res/layout/show_habit_frequency.xml
@@ -24,7 +24,7 @@
         style="@style/CardHeader"
         android:text="@string/frequency"/>
 
-    <org.isoron.uhabits.ui.common.views.FrequencyChart
+    <org.isoron.uhabits.activities.common.views.FrequencyChart
         android:id="@+id/frequencyChart"
         android:layout_width="match_parent"
         android:layout_height="200dp"/>
diff --git a/app/src/main/res/layout/show_habit_history.xml b/app/src/main/res/layout/show_habit_history.xml
index 0916b9c78..9e89365c3 100644
--- a/app/src/main/res/layout/show_habit_history.xml
+++ b/app/src/main/res/layout/show_habit_history.xml
@@ -29,7 +29,7 @@
         style="@style/CardHeader"
         android:text="@string/history"/>
 
-    <org.isoron.uhabits.ui.common.views.HistoryChart
+    <org.isoron.uhabits.activities.common.views.HistoryChart
         android:id="@+id/historyChart"
         android:layout_width="match_parent"
         android:layout_height="160dp"/>
diff --git a/app/src/main/res/layout/show_habit_inner.xml b/app/src/main/res/layout/show_habit_inner.xml
index a16548f53..4199e6b95 100644
--- a/app/src/main/res/layout/show_habit_inner.xml
+++ b/app/src/main/res/layout/show_habit_inner.xml
@@ -32,7 +32,7 @@
         style="@style/CardList"
         android:clipToPadding="false">
 
-        <org.isoron.uhabits.ui.habits.show.views.SubtitleCard
+        <org.isoron.uhabits.activities.habits.show.views.SubtitleCard
             android:id="@+id/subtitleCard"
             style="@style/ShowHabit.Subtitle"/>
 
@@ -40,27 +40,27 @@
         <!--android:id="@+id/headerShadow"-->
         <!--style="@style/ToolbarShadow"/>-->
 
-        <org.isoron.uhabits.ui.habits.show.views.OverviewCard
+        <org.isoron.uhabits.activities.habits.show.views.OverviewCard
             android:id="@+id/overviewCard"
             style="@style/Card"
             android:paddingTop="12dp"/>
 
-        <org.isoron.uhabits.ui.habits.show.views.ScoreCard
+        <org.isoron.uhabits.activities.habits.show.views.ScoreCard
             android:id="@+id/scoreCard"
             style="@style/Card"
             android:gravity="center"/>
 
-        <org.isoron.uhabits.ui.habits.show.views.HistoryCard
+        <org.isoron.uhabits.activities.habits.show.views.HistoryCard
             android:id="@+id/historyCard"
             style="@style/Card"
             android:gravity="center"
             android:paddingBottom="0dp"/>
 
-        <org.isoron.uhabits.ui.habits.show.views.StreakCard
+        <org.isoron.uhabits.activities.habits.show.views.StreakCard
             android:id="@+id/streakCard"
             style="@style/Card"/>
 
-        <org.isoron.uhabits.ui.habits.show.views.FrequencyCard
+        <org.isoron.uhabits.activities.habits.show.views.FrequencyCard
             android:id="@+id/frequencyCard"
             style="@style/Card"/>
 
diff --git a/app/src/main/res/layout/show_habit_overview.xml b/app/src/main/res/layout/show_habit_overview.xml
index d34f5fb84..908927c3c 100644
--- a/app/src/main/res/layout/show_habit_overview.xml
+++ b/app/src/main/res/layout/show_habit_overview.xml
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="5">
 
-            <org.isoron.uhabits.ui.common.views.RingView
+            <org.isoron.uhabits.activities.common.views.RingView
                 android:id="@+id/scoreRing"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
diff --git a/app/src/main/res/layout/show_habit_score.xml b/app/src/main/res/layout/show_habit_score.xml
index 8a9db42b3..c3e7f5d5b 100644
--- a/app/src/main/res/layout/show_habit_score.xml
+++ b/app/src/main/res/layout/show_habit_score.xml
@@ -42,7 +42,7 @@
             android:layout_alignParentTop="true"
             android:text="@string/habit_strength"/>
 
-        <org.isoron.uhabits.ui.common.views.ScoreChart
+        <org.isoron.uhabits.activities.common.views.ScoreChart
             android:id="@+id/scoreView"
             android:layout_width="match_parent"
             android:layout_height="220dp"
diff --git a/app/src/main/res/layout/show_habit_streak.xml b/app/src/main/res/layout/show_habit_streak.xml
index 23eeb94f8..4a17485de 100644
--- a/app/src/main/res/layout/show_habit_streak.xml
+++ b/app/src/main/res/layout/show_habit_streak.xml
@@ -24,7 +24,7 @@
         style="@style/CardHeader"
         android:text="@string/best_streaks"/>
 
-    <org.isoron.uhabits.ui.common.views.StreakChart
+    <org.isoron.uhabits.activities.common.views.StreakChart
         android:id="@+id/streakChart"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/widget_checkmark.xml b/app/src/main/res/layout/widget_checkmark.xml
index 552edabe8..90a36d2b3 100644
--- a/app/src/main/res/layout/widget_checkmark.xml
+++ b/app/src/main/res/layout/widget_checkmark.xml
@@ -27,7 +27,7 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <org.isoron.uhabits.ui.common.views.RingView
+    <org.isoron.uhabits.activities.common.views.RingView
         android:id="@+id/scoreRing"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/xml/widget_checkmark_info.xml b/app/src/main/res/xml/widget_checkmark_info.xml
index 729170884..3474f56bf 100644
--- a/app/src/main/res/xml/widget_checkmark_info.xml
+++ b/app/src/main/res/xml/widget_checkmark_info.xml
@@ -25,7 +25,7 @@
                     android:previewImage="@drawable/widget_preview_checkmark"
                     android:resizeMode="none"
                     android:updatePeriodMillis="3600000"
-                    android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
+                    android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
                     android:widgetCategory="home_screen">
 
 
diff --git a/app/src/main/res/xml/widget_frequency_info.xml b/app/src/main/res/xml/widget_frequency_info.xml
index 2cb07f9a6..32a25906b 100644
--- a/app/src/main/res/xml/widget_frequency_info.xml
+++ b/app/src/main/res/xml/widget_frequency_info.xml
@@ -27,7 +27,7 @@
                     android:previewImage="@drawable/widget_preview_frequency"
                     android:resizeMode="vertical|horizontal"
                     android:updatePeriodMillis="3600000"
-                    android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
+                    android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
                     android:widgetCategory="home_screen">
 
 </appwidget-provider>
\ No newline at end of file
diff --git a/app/src/main/res/xml/widget_history_info.xml b/app/src/main/res/xml/widget_history_info.xml
index 392fa0892..5b8d501af 100644
--- a/app/src/main/res/xml/widget_history_info.xml
+++ b/app/src/main/res/xml/widget_history_info.xml
@@ -27,7 +27,7 @@
                     android:previewImage="@drawable/widget_preview_history"
                     android:resizeMode="vertical|horizontal"
                     android:updatePeriodMillis="3600000"
-                    android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
+                    android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
                     android:widgetCategory="home_screen">
 
 </appwidget-provider>
\ No newline at end of file
diff --git a/app/src/main/res/xml/widget_score_info.xml b/app/src/main/res/xml/widget_score_info.xml
index e69902047..e2be33252 100644
--- a/app/src/main/res/xml/widget_score_info.xml
+++ b/app/src/main/res/xml/widget_score_info.xml
@@ -27,7 +27,7 @@
                     android:previewImage="@drawable/widget_preview_score"
                     android:resizeMode="vertical|horizontal"
                     android:updatePeriodMillis="3600000"
-                    android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
+                    android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
                     android:widgetCategory="home_screen">
 
 </appwidget-provider>
\ No newline at end of file
diff --git a/app/src/main/res/xml/widget_streak_info.xml b/app/src/main/res/xml/widget_streak_info.xml
index e201161dd..4ca86447f 100644
--- a/app/src/main/res/xml/widget_streak_info.xml
+++ b/app/src/main/res/xml/widget_streak_info.xml
@@ -27,7 +27,7 @@
                     android:previewImage="@drawable/widget_preview_streaks"
                     android:resizeMode="vertical|horizontal"
                     android:updatePeriodMillis="3600000"
-                    android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
+                    android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
                     android:widgetCategory="home_screen">
 
 </appwidget-provider>
\ No newline at end of file
diff --git a/app/src/test/java/org/isoron/uhabits/BaseUnitTest.java b/app/src/test/java/org/isoron/uhabits/BaseUnitTest.java
index 4ba5e4c59..6fdf54a88 100644
--- a/app/src/test/java/org/isoron/uhabits/BaseUnitTest.java
+++ b/app/src/test/java/org/isoron/uhabits/BaseUnitTest.java
@@ -23,7 +23,7 @@ import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 
diff --git a/app/src/test/java/org/isoron/uhabits/MockModule.java b/app/src/test/java/org/isoron/uhabits/MockModule.java
index bf4e7b044..1b31ed5e2 100644
--- a/app/src/test/java/org/isoron/uhabits/MockModule.java
+++ b/app/src/test/java/org/isoron/uhabits/MockModule.java
@@ -23,9 +23,9 @@ import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
-import org.isoron.uhabits.ui.widgets.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import javax.inject.*;
 
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/ListHabitsScreenTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java
similarity index 96%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/ListHabitsScreenTest.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java
index c4f728588..fe308c164 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/ListHabitsScreenTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 
 import android.content.*;
@@ -28,10 +28,10 @@ import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
-import org.isoron.uhabits.ui.common.dialogs.ColorPickerDialog.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialog.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 import org.junit.*;
 import org.junit.runner.*;
 import org.junit.runners.*;
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/CheckmarkButtonControllerTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
similarity index 95%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/CheckmarkButtonControllerTest.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
index fda50b089..65f02345f 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/CheckmarkButtonControllerTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 import org.junit.*;
 
 import static org.mockito.Mockito.*;
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardControllerTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java
similarity index 94%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardControllerTest.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java
index a497bba75..554716de6 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardControllerTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardListControllerTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java
similarity index 96%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardListControllerTest.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java
index 8f545ef77..d3dc4e898 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/HabitCardListControllerTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/package-info.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java
similarity index 93%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/package-info.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java
index fde4eb82c..90ef83893 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/controllers/package-info.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Contains views for ListHabitsActivity
  */
-package org.isoron.uhabits.ui.habits.list.controllers;
\ No newline at end of file
+package org.isoron.uhabits.activities.habits.list.controllers;
\ No newline at end of file
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapterTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapterTest.java
similarity index 97%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapterTest.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapterTest.java
index 13e153e31..aa8fb199c 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListAdapterTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapterTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import org.isoron.uhabits.BaseUnitTest;
 import org.junit.Before;
diff --git a/app/src/test/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCacheTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCacheTest.java
similarity index 98%
rename from app/src/test/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCacheTest.java
rename to app/src/test/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCacheTest.java
index 44324f412..343c7823e 100644
--- a/app/src/test/java/org/isoron/uhabits/ui/habits/list/model/HabitCardListCacheTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCacheTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;