diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java
index 2588208f1..a25bd202b 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java
@@ -21,8 +21,9 @@ package org.isoron.uhabits;
 
 
 import org.isoron.androidbase.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.models.sqlite.*;
-import org.isoron.uhabits.tasks.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
index 9ea0dec04..7304a16bf 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
@@ -30,9 +30,10 @@ import android.util.*;
 import junit.framework.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
index 2237abac1..b63e3ed65 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
@@ -24,7 +24,6 @@ import android.support.annotation.*;
 import android.view.*;
 import android.widget.*;
 
-import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;
@@ -36,7 +35,6 @@ import static android.os.Build.VERSION.*;
 import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static android.view.View.MeasureSpec.*;
-import static junit.framework.Assert.*;
 
 public class BaseViewTest extends BaseAndroidTest
 {
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
index 288e45c3f..b8641c46e 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.DateUtils;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.DateUtils;
 
 public class HabitFixtures
 {
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
index b7e5f3b1f..78ae34631 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
+++ b/uhabits-android/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.androidbase.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
index c208cadff..579cd08bb 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
@@ -23,7 +23,8 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
index 563a3c2ec..69560a38c 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
@@ -23,7 +23,7 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
index d3ee2f3b8..cbcfa350f 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
@@ -23,7 +23,7 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
index 8c5327503..43eb981db 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
@@ -23,7 +23,8 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
index 47b9e7c04..da2df3138 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
@@ -23,7 +23,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java
index f26cd3b33..de5823212 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java
@@ -24,10 +24,10 @@ import android.view.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 import org.junit.*;
 import org.mockito.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java
index 1be789c0d..31857e61c 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java
@@ -27,11 +27,12 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.callbacks.*;
 import org.junit.*;
 import org.junit.runner.*;
 import org.junit.runners.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
index be4ddb02e..864adbb77 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 import org.junit.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java
index b5626b448..8b0886c0b 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java
@@ -20,9 +20,9 @@
 package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import static org.mockito.Mockito.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java
index c64b7fb91..528d3675b 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
 import org.junit.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java
index a3f933c4f..e096922a0 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java
@@ -23,7 +23,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java
index 22b69754a..eb7439847 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java
@@ -22,8 +22,8 @@ package org.isoron.uhabits.activities.habits.list.views;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.*;
 
-import org.isoron.uhabits.models.Checkmark;
-import org.isoron.uhabits.models.Habit;
+import org.isoron.uhabits.core.models.Checkmark;
+import org.isoron.uhabits.core.models.Habit;
 import org.isoron.uhabits.BaseViewTest;
 import org.isoron.uhabits.utils.ColorUtils;
 import org.junit.Before;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.java
index 172ce43e5..651e89f91 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.java
@@ -23,8 +23,8 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
index 1147748d9..898bdab0e 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
@@ -23,8 +23,8 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
index cced99f6d..9f8e5525a 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
@@ -23,12 +23,12 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.junit.*;
 import org.junit.runner.*;
 
-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.*;
 
 @RunWith(AndroidJUnit4.class)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
index 2e37d1c10..0b3e7a8c3 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
index 0a9d69291..91bffd89a 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
index 0e54b7adf..399cdf8a0 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
index c93d0b1bd..16f3ae61b 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
index ae12e3819..ef1a2a9a1 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
index 09cfb02b2..74564d8c6 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/commands/CommandParserTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/commands/CommandParserTest.java
similarity index 97%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/commands/CommandParserTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/commands/CommandParserTest.java
index c849a6776..d8eca8ea1 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/commands/CommandParserTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/commands/CommandParserTest.java
@@ -17,13 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
 import org.hamcrest.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.json.*;
 import org.junit.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/io/HabitsCSVExporterTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
similarity index 96%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/io/HabitsCSVExporterTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
index c784f2a9a..48f173bc3 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/io/HabitsCSVExporterTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.io;
+package org.isoron.uhabits.core.io;
 
 import android.content.*;
 import android.support.test.*;
@@ -26,7 +26,7 @@ import android.test.suitebuilder.annotation.*;
 
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
@@ -34,8 +34,6 @@ import java.io.*;
 import java.util.*;
 import java.util.zip.*;
 
-import static junit.framework.Assert.*;
-
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class HabitsCSVExporterTest extends BaseAndroidTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/io/ImportTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/ImportTest.java
similarity index 97%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/io/ImportTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/ImportTest.java
index 073e0799c..d1ef5f053 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/io/ImportTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/ImportTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.io;
+package org.isoron.uhabits.core.io;
 
 import android.content.*;
 import android.support.test.*;
@@ -26,8 +26,9 @@ import android.test.suitebuilder.annotation.*;
 
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
+import org.isoron.uhabits.io.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/HabitListTest.java
similarity index 98%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/HabitListTest.java
index 92f71a3f4..28e5cffc7 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/HabitListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -30,11 +30,10 @@ import org.junit.runner.*;
 import java.io.*;
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 
 @SuppressWarnings("JavaDoc")
 @RunWith(AndroidJUnit4.class)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/HabitRecordTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/HabitRecordTest.java
similarity index 96%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/HabitRecordTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/HabitRecordTest.java
index d701056df..4435bb961 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/HabitRecordTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/HabitRecordTest.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteCheckmarkListTest.java
similarity index 96%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteCheckmarkListTest.java
index f4f779950..1817c338c 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteCheckmarkListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -25,16 +25,16 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.util.*;
 
-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteHabitListTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
similarity index 97%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteHabitListTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
index 5308fc61c..211a6838d 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteHabitListTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -25,7 +25,8 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.junit.*;
 import org.junit.rules.*;
@@ -33,7 +34,6 @@ import org.junit.runner.*;
 
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionListTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
similarity index 95%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionListTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
index 08eea948b..3964aca1d 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionListTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.annotation.*;
 import android.support.test.runner.*;
@@ -26,18 +26,18 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.util.*;
 
-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsNot.not;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteScoreListTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteScoreListTest.java
similarity index 96%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteScoreListTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteScoreListTest.java
index a4214933c..f71172894 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteScoreListTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteScoreListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -25,9 +25,9 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportCSVTaskTest.java
similarity index 94%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportCSVTaskTest.java
index 7c2d3a641..1f9664960 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportCSVTaskTest.java
@@ -17,20 +17,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.io.*;
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.IsNot.not;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportDBTaskTest.java
similarity index 92%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportDBTaskTest.java
index c2aaf6514..316486f97 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportDBTaskTest.java
@@ -17,20 +17,18 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.tasks.android.*;
+import org.isoron.uhabits.tasks.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.io.*;
 
-import static junit.framework.Assert.*;
-
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class ExportDBTaskTest extends BaseAndroidTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/utils/ReminderSchedulerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/utils/ReminderSchedulerTest.java
similarity index 96%
rename from uhabits-android/src/androidTest/java/org/isoron/uhabits/utils/ReminderSchedulerTest.java
rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/core/utils/ReminderSchedulerTest.java
index 7ee249a1f..c9ea5b6be 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/utils/ReminderSchedulerTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/core/utils/ReminderSchedulerTest.java
@@ -17,14 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import android.app.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.utils.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java
index 631f2d396..cfb914f9f 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java
@@ -28,7 +28,7 @@ import com.getpebble.android.kit.*;
 import com.getpebble.android.kit.util.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.receivers.*;
 import org.json.*;
 import org.junit.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/ReminderControllerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
index 00fa88e18..7e4c8ddd1 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
@@ -20,8 +20,9 @@
 package org.isoron.uhabits.receivers;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/WidgetControllerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
index ee9e4a826..e51f222d1 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
@@ -20,16 +20,16 @@
 package org.isoron.uhabits.receivers;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.notifications.*;
-import org.isoron.uhabits.ui.widgets.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.ui.widgets.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 import static org.mockito.Mockito.*;
 
 public class WidgetControllerTest extends BaseAndroidTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
index 9e25e12ef..130ec3b68 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
@@ -24,13 +24,13 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
index 8f8d9c507..dd9d4304c 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
index 16c45c408..61c8c3528 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
index f4d5074b6..82f2c451f 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
index 1c7639bb2..eb4cbbe90 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
index d339fb3d6..7ff714856 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
@@ -23,7 +23,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
diff --git a/uhabits-android/src/main/java/org/isoron/androidbase/BaseSystem.java b/uhabits-android/src/main/java/org/isoron/androidbase/BaseSystem.java
index 52657667a..6f6df9168 100644
--- a/uhabits-android/src/main/java/org/isoron/androidbase/BaseSystem.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/BaseSystem.java
@@ -28,9 +28,10 @@ import android.view.*;
 
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.lang.Process;
diff --git a/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityComponent.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityComponent.java
index ce1ee0c3d..761d96926 100644
--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityComponent.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityComponent.java
@@ -21,7 +21,7 @@ package org.isoron.androidbase.activities;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java
index ffcb238f1..adac8f2e5 100644
--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java
@@ -22,7 +22,7 @@ package org.isoron.androidbase.activities;
 import android.content.*;
 
 import org.isoron.uhabits.activities.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java
index 12738f2f9..d2df1f594 100644
--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java
@@ -23,7 +23,7 @@ import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.*;
 
 public class BaseExceptionHandler implements Thread.UncaughtExceptionHandler
diff --git a/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
index adbed1b23..d86aafa00 100644
--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
@@ -27,7 +27,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;
 import org.isoron.uhabits.utils.*;
 
 import static android.os.Build.VERSION.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.java
index fb781c273..81e6574cf 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.java
@@ -22,8 +22,9 @@ package org.isoron.uhabits;
 import android.support.annotation.*;
 import android.util.*;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.text.*;
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
index aef637f24..caaf25957 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
@@ -27,8 +27,8 @@ import com.activeandroid.*;
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsComponent.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsComponent.java
index 8b819c99e..3e4af09b1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsComponent.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsComponent.java
@@ -22,18 +22,21 @@ package org.isoron.uhabits;
 import android.content.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.io.*;
-import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.tasks.android.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
index 734b78110..db1a0cdcf 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
@@ -19,9 +19,11 @@
 
 package org.isoron.uhabits;
 
+import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.java
index 19386fc62..295182d02 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.java
@@ -23,8 +23,8 @@ import android.support.annotation.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
index 33689dbe2..b99bd15ed 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
@@ -23,7 +23,7 @@ import android.os.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.about.*;
+import org.isoron.uhabits.core.ui.screens.about.*;
 
 /**
  * Activity that allows the user to see information about the app itself.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
index 29db69229..db7583b2e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
@@ -26,7 +26,7 @@ import android.widget.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.BuildConfig;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.screens.about.*;
+import org.isoron.uhabits.core.ui.screens.about.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
index 2f915dc89..de7037dfc 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
@@ -24,7 +24,7 @@ import android.widget.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.ui.screens.about.*;
+import org.isoron.uhabits.core.ui.screens.about.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
index 7ca527ff5..8e58acded 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.activities.common.dialogs;
 
-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 import org.isoron.uhabits.utils.*;
 
 /**
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
index 1b8c838cf..445cfb8d0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
@@ -27,7 +27,7 @@ import com.google.auto.factory.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 
 import butterknife.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
index 53b079b47..19d4afb86 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
@@ -29,8 +29,8 @@ import android.util.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import static org.isoron.uhabits.utils.InterfaceUtils.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
index 08b754df7..91f2012b9 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
@@ -26,8 +26,8 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.app.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 /**
  * Dialog that allows the user to pick one or more days of the week.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
index 6dab1f948..fe5bbae42 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
@@ -26,7 +26,8 @@ import android.util.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.text.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
index 444d359d3..9f6400eeb 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
@@ -25,6 +25,7 @@ import android.support.annotation.*;
 import android.util.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.text.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
index cd74cf15c..c10a1f466 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.activities.common.views;
 
-import org.isoron.uhabits.models.Habit;
+import org.isoron.uhabits.core.models.Habit;
 
 public interface HabitChart
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
index 6abf7cfb9..a76c8d208 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
@@ -27,12 +27,13 @@ import android.util.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.text.*;
 import java.util.*;
 
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 import static org.isoron.uhabits.utils.InterfaceUtils.*;
 
 public class HistoryChart extends ScrollableChart
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
index f6ee889f7..f2d540517 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
@@ -25,7 +25,8 @@ import android.support.annotation.*;
 import android.util.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.text.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
index e5eae8da9..361828c05 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
@@ -26,7 +26,8 @@ import android.view.*;
 import android.view.ViewGroup.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.text.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
index 40be10cfb..5eb74bf2d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -33,14 +33,14 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.views.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 
 import butterknife.*;
 
 import static android.view.View.*;
-import static org.isoron.uhabits.activities.ThemeSwitcher.THEME_LIGHT;
+import static org.isoron.uhabits.core.ui.ThemeSwitcher.THEME_LIGHT;
 
 public class EditHabitDialog extends AppCompatDialogFragment
 {
@@ -77,7 +77,7 @@ public class EditHabitDialog extends AppCompatDialogFragment
     @Override
     public int getTheme()
     {
-        AppComponent component =
+        HabitsComponent component =
             ((HabitsApplication) getContext().getApplicationContext()).getComponent();
 
         if(component.getPreferences().getTheme() == THEME_LIGHT)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
index 7ca3ef391..a91c3b14a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.edit;
 import android.os.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
index cb4f86d56..aac5d47e7 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
@@ -28,7 +28,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import butterknife.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
index 5c07aab0f..6d2ac6848 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
@@ -29,7 +29,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
index 4c7287e5a..6d2c399e7 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
@@ -31,7 +31,7 @@ import com.android.datetimepicker.time.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java
index 435576dca..6644fca1c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java
@@ -27,8 +27,8 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.utils.*;
 
 /**
  * Activity that allows the user to see and modify the list of habits.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
index 796667c55..a9e49208f 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
@@ -25,10 +25,10 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.tasks.android.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 
 import java.io.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
index 9752792fd..8eabf2192 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
@@ -24,9 +24,9 @@ import android.view.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.java
index e1699c347..275e4850e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.java
@@ -23,7 +23,7 @@ package org.isoron.uhabits.activities.habits.list;
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
index e9ebfc600..92656a404 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
@@ -31,9 +31,9 @@ import org.isoron.uhabits.activities.common.views.*;
 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.models.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java
index c52f828aa..1d6c6dbd6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java
@@ -34,13 +34,13 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.callbacks.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;
 
 import java.io.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java
index d4f240693..6a1334b04 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java
@@ -26,8 +26,8 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
index b8b7e04a4..735e53a62 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
@@ -24,7 +24,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.*;
 
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 
 @AutoFactory
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
index aa29f37c3..b4ea81ece 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class HabitCardController implements HabitCardView.Controller
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
index de03d3c26..375cfa393 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
@@ -24,7 +24,7 @@ import android.support.annotation.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
index 0198625d3..972d9895b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
@@ -24,7 +24,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.*;
 
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 
 @AutoFactory
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
index ebdda50c8..b2b3c86a4 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
@@ -26,10 +26,10 @@ import android.view.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
-import org.isoron.uhabits.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
index 5b34e1e6a..478ef3597 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
@@ -32,7 +32,7 @@ import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.utils.*;
 
 import static android.view.View.MeasureSpec.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 import static org.isoron.uhabits.utils.AttributeSetUtils.*;
 import static org.isoron.uhabits.utils.InterfaceUtils.getDimension;
 import static org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
index 16cc528e2..301317d23 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
@@ -27,9 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
index f0a2852d4..1f0b538fd 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
@@ -30,7 +30,7 @@ import android.view.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
index 0200471a9..5aeeae9c7 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
@@ -31,7 +31,8 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
index 733e8fd64..b126742f1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
@@ -27,6 +27,7 @@ import android.util.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
index 0ca67151b..1848b4827 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
@@ -29,7 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.screens.habits.list.HintList;
+import org.isoron.uhabits.core.ui.screens.habits.list.HintList;
 
 import java.util.Random;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
index 3bbcf95f3..0f8ca0991 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
@@ -27,9 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
index 5c5e8e003..72287711c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
@@ -26,7 +26,7 @@ import android.support.annotation.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * Activity that allows the user to see more information about a single habit.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java
index e91e217c5..4cbf41b13 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java
@@ -23,7 +23,7 @@ import android.support.annotation.*;
 
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.show.views.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java
index 966643dbf..cca8d7a0e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java
@@ -23,8 +23,8 @@ import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.activities.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
index 986c4c9a8..28e899118 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
@@ -27,7 +27,7 @@ import android.support.v7.widget.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.habits.show.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
index 4d8f3e040..f5b3bf622 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
@@ -25,8 +25,8 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
index 32f039f7b..506e381ff 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
@@ -24,7 +24,7 @@ import android.view.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
index edf876f33..a2a2ae5e4 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
@@ -27,8 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
index d9b6c2786..629aa340e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
@@ -27,8 +27,8 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
index 0c31112d6..255b518e1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
@@ -24,8 +24,8 @@ import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.models.memory.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.memory.*;
 
 public abstract class HabitCard extends LinearLayout
     implements ModelObservable.Listener
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
index 248285cbd..4ac90b5af 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
@@ -27,8 +27,8 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
index 080c8e4c6..f98d738e4 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
@@ -27,8 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
index d40c61cd5..65c242c9d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
@@ -27,9 +27,10 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
index d1607e973..bf5c24ff1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
@@ -27,8 +27,8 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
index 6a6bbd22e..07b712f73 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
@@ -26,7 +26,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java
index 3ca38f919..c0ec8a2a3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java
@@ -23,7 +23,7 @@ import android.os.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class EditSettingActivity extends BaseActivity
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.java b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.java
index 478170496..e18b2c367 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.java
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import static org.isoron.uhabits.automation.FireSettingReceiver.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
index bcd0061b8..80ab1632a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
@@ -27,7 +27,7 @@ import android.widget.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.java b/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.java
index cfc122a17..d16ce1d9c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.java
@@ -23,10 +23,10 @@ import android.content.*;
 import android.os.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.receivers.*;
-import org.isoron.uhabits.ui.widgets.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.ui.widgets.*;
+import org.isoron.uhabits.core.utils.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/commands/CommandParser.java b/uhabits-android/src/main/java/org/isoron/uhabits/commands/CommandParser.java
index 240553a68..8c228a716 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/commands/CommandParser.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/commands/CommandParser.java
@@ -23,8 +23,8 @@ import android.support.annotation.*;
 
 import com.google.gson.*;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.json.*;
 
 import javax.inject.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
index 0e6e41b9b..366483156 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
@@ -28,7 +28,7 @@ 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 org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.java b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.java
index a6dc23e3f..2ae83cce0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.java
@@ -23,9 +23,9 @@ import android.content.*;
 import android.net.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java
index 5757a4b83..bd8cc5d77 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java
index cb3a8867c..26f87fe76 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java
@@ -25,8 +25,8 @@ import android.net.*;
 import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.receivers.*;
 
 import javax.inject.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java
index d20979e78..28f5e028a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.io;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java
index dcdf9e354..6c843f31d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.io;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java
index 42fb9b09b..891d5bbc9 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java
@@ -24,8 +24,8 @@ import android.support.annotation.*;
 import com.activeandroid.*;
 import com.opencsv.*;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
index 1c7559e8a..3cd4b7cb0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
@@ -30,7 +30,7 @@ import com.activeandroid.*;
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;
 
 import java.io.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java
index 0865671b7..7082ed1bd 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java
@@ -23,9 +23,9 @@ import android.database.*;
 import android.database.sqlite.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java
index 2282f7293..73a8ba6a0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java
@@ -23,9 +23,9 @@ import android.database.*;
 import android.database.sqlite.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLModelFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLModelFactory.java
index 7cdbcbc4f..839a71aec 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLModelFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLModelFactory.java
@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits.models.sqlite;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
index 7c9b552e0..a532e1018 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
@@ -26,9 +26,9 @@ import android.support.annotation.Nullable;
 import com.activeandroid.*;
 import com.activeandroid.query.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
index c3449f65d..6f9106cbb 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
@@ -25,7 +25,7 @@ import com.activeandroid.query.*;
 import com.activeandroid.util.*;
 
 import org.apache.commons.lang3.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 
 import java.util.*;
@@ -261,7 +261,7 @@ public class SQLiteHabitList extends HabitList
         }
     }
 
-    protected synchronized List<Habit> toList()
+    public synchronized List<Habit> toList()
     {
         String query = buildSelectQuery();
         List<HabitRecord> recordList = sqlite.query(query, null);
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java
index 2794950f5..7641b356d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java
@@ -19,15 +19,15 @@
 
 package org.isoron.uhabits.models.sqlite;
 
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.*;
+import android.database.sqlite.*;
 import android.support.annotation.*;
 import android.support.annotation.Nullable;
 
-import com.activeandroid.Cache;
+import com.activeandroid.*;
 import com.activeandroid.query.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.jetbrains.annotations.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
index 6479a58fc..4474db0b0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
@@ -26,7 +26,7 @@ import android.support.annotation.Nullable;
 import com.activeandroid.*;
 import com.activeandroid.query.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.jetbrains.annotations.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
index 8cf10b49f..43a6e0e9d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
@@ -24,7 +24,8 @@ import android.support.annotation.Nullable;
 
 import com.activeandroid.query.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.isoron.uhabits.utils.*;
 import org.jetbrains.annotations.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
index 6938b505d..74c8e8a6d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * The SQLite database record corresponding to a {@link Checkmark}.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
index 6edafacda..5cd02bb65 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
@@ -28,7 +28,7 @@ import com.activeandroid.annotation.*;
 import com.activeandroid.query.*;
 import com.activeandroid.util.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;
 
 import java.lang.reflect.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/RepetitionRecord.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/RepetitionRecord.java
index 874fd0954..b10b7c73e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/RepetitionRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/RepetitionRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * The SQLite database record corresponding to a {@link Repetition}.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/ScoreRecord.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/ScoreRecord.java
index 69969edfb..0907d3115 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/ScoreRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/ScoreRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * The SQLite database record corresponding to a Score.
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/StreakRecord.java b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/StreakRecord.java
index 1638089db..a16878ea3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/StreakRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/StreakRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.lang.reflect.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.java b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.java
index 4bb86c05a..73039b6e6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.java
@@ -28,13 +28,14 @@ import android.support.v4.app.NotificationCompat.*;
 
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.java b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.java
index 622b25f8c..ea4f4ff85 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.java
@@ -28,6 +28,7 @@ import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/AndroidPreferences.java b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/AndroidPreferences.java
index d8961ac9a..76aad2696 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/AndroidPreferences.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/AndroidPreferences.java
@@ -24,8 +24,10 @@ import android.preference.*;
 
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
index 0fb10a8d4..20e9b32e5 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
@@ -23,8 +23,8 @@ import android.content.*;
 import android.preference.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/PebbleReceiver.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/PebbleReceiver.java
index aa44e3faf..85d3140e6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/PebbleReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/PebbleReceiver.java
@@ -28,12 +28,12 @@ import com.getpebble.android.kit.PebbleKit.*;
 import com.getpebble.android.kit.util.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
index fff5cb8bc..897972206 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
@@ -21,8 +21,9 @@ package org.isoron.uhabits.receivers;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
index 5cf0c2600..e6187feaf 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
@@ -23,8 +23,8 @@ import android.content.*;
 import android.util.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
index 327952110..de5ebbcc2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
@@ -26,7 +26,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
-import org.isoron.uhabits.ui.widgets.*;
+import org.isoron.uhabits.core.ui.widgets.*;
 
 import dagger.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java b/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
index c851df87d..189a60ade 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
@@ -25,6 +25,8 @@ import android.util.*;
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.preferences.*;
 import org.json.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/AndroidTaskRunner.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
similarity index 96%
rename from uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/AndroidTaskRunner.java
rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
index bb96eb05c..7b60834ba 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/AndroidTaskRunner.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;
 
 import android.os.*;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.tasks.*;
 
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ExportDBTask.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
similarity index 96%
rename from uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ExportDBTask.java
rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
index 3f9ef1180..013027925 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ExportDBTask.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -25,7 +25,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import java.io.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ImportDataTask.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
similarity index 96%
rename from uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ImportDataTask.java
rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
index 560795f99..a23343a2c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ImportDataTask.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;
 
 import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.io.*;
-import org.isoron.uhabits.tasks.*;
 
 import java.io.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/package-info.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/package-info.java
similarity index 90%
rename from uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/package-info.java
rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/package-info.java
index b70215e3e..5a175d814 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/package-info.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/package-info.java
@@ -19,6 +19,6 @@
 
 /**
  * Provides async tasks for useful operations such as {@link
- * org.isoron.uhabits.tasks.ExportCSVTask}.
+ * org.isoron.uhabits.core.tasks.ExportCSVTask}.
  */
-package org.isoron.uhabits.tasks.android;
\ No newline at end of file
+package org.isoron.uhabits.tasks;
\ No newline at end of file
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
index 66a965217..81e72b3b0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
@@ -20,6 +20,8 @@ package org.isoron.uhabits.utils;
 
 import android.support.annotation.*;
 
+import org.isoron.uhabits.core.utils.*;
+
 import java.text.*;
 import java.util.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java
index ba10e8733..2300d2249 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java
@@ -21,8 +21,10 @@ package org.isoron.uhabits.utils;
 
 import android.content.*;
 import android.text.format.*;
+import android.text.format.DateUtils;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
@@ -41,8 +43,8 @@ public class AndroidDateUtils
 
     public static String formatWeekdayList(Context context, boolean weekday[])
     {
-        String shortDayNames[] = DateUtils.getShortDayNames();
-        String longDayNames[] = DateUtils.getLongDayNames();
+        String shortDayNames[] = org.isoron.uhabits.core.utils.DateUtils.getShortDayNames();
+        String longDayNames[] = org.isoron.uhabits.core.utils.DateUtils.getLongDayNames();
         StringBuilder buffer = new StringBuilder();
 
         int count = 0;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
index f8126d685..1e03f4f95 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
@@ -26,6 +26,7 @@ import com.activeandroid.*;
 
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.isoron.uhabits.sync.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/ReminderScheduler.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ReminderScheduler.java
index e0d02e85b..914c8a8f6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/ReminderScheduler.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ReminderScheduler.java
@@ -23,15 +23,17 @@ import android.app.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
 import javax.inject.*;
 
-import static org.isoron.uhabits.utils.DateUtils.*;
+import static org.isoron.uhabits.core.utils.DateUtils.*;
 
 @AppScope
 public class ReminderScheduler implements CommandRunner.Listener
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
index 583947682..75a62f66d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -28,7 +28,7 @@ import android.widget.*;
 import com.activeandroid.util.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 
 import static android.appwidget.AppWidgetManager.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java
index aa57e7371..4eb6fd69a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.java
@@ -24,7 +24,7 @@ import android.content.*;
 import android.support.annotation.*;
 import android.view.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.views.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
index cd3fe8e62..3b798bd72 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.widgets;
 import android.content.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class CheckmarkWidgetProvider extends BaseWidgetProvider
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java
index ff76fdac4..ea4e3d889 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.java
@@ -25,7 +25,7 @@ import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.views.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java
index 2d3e5fce9..423cf6ebc 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.widgets;
 import android.content.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class FrequencyWidgetProvider extends BaseWidgetProvider
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
index 983e25250..f6f586c4b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
@@ -26,7 +26,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 
 import java.util.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java
index 0553e35ff..3035aec77 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.java
@@ -25,7 +25,7 @@ import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.views.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java
index 6f377ca3a..4fad4b853 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.widgets;
 import android.content.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class HistoryWidgetProvider extends BaseWidgetProvider
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
index 325b3b464..1fcb02721 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
@@ -27,7 +27,7 @@ import android.view.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.activities.habits.show.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.views.*;
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java
index 002be7f17..1ad3fb80b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.widgets;
 import android.content.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class ScoreWidgetProvider extends BaseWidgetProvider
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java
index ecf3fe957..781ee71f4 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.java
@@ -26,7 +26,7 @@ import android.view.*;
 import android.view.ViewGroup.*;
 
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.views.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java
index 211246eb3..a097f7bb6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.widgets;
 import android.content.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public class StreakWidgetProvider extends BaseWidgetProvider
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java
index 1d326a46a..a10014212 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java
@@ -24,8 +24,8 @@ import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.tasks.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
index 2bddef022..00afeb46b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
@@ -25,7 +25,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/AppScope.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/AppScope.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java
index 75c59577a..0aa1b9b52 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/AppScope.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits;
+package org.isoron.uhabits.core;
 
 import javax.inject.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/MyClass.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/MyClass.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/MyClass.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/MyClass.java
index b2332c44d..dd5cdb01d 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/MyClass.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/MyClass.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits;
+package org.isoron.uhabits.core;
 
 public class MyClass
 {}
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java
index 0773b64e7..69797821b 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/ChangeHabitColorCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/ChangeHabitColorCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java
index b3683901f..36ffe7945 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/ChangeHabitColorCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/Command.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/Command.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java
index 721efde98..7d48754ba 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/Command.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
 import com.google.gson.*;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 /**
  * A Command represents a desired set of changes that should be performed on the
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/CommandRunner.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/CommandRunner.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java
index 8ef46f6ec..6cac8a364 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/CommandRunner.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.tasks.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/CreateHabitCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/CreateHabitCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java
index 61fbb9d4d..e5f8f15be 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/CreateHabitCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * Command to create a habit.
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/CreateRepetitionCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/CreateRepetitionCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java
index ddebd1073..9264a9c90 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/CreateRepetitionCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * Command to toggle a repetition.
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java
index 082990c28..1a99aa723 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/EditHabitCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/EditHabitCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java
index 48c37ecc1..2870f4400 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/EditHabitCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * Command to modify a habit.
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/ToggleRepetitionCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/ToggleRepetitionCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java
index 556bf3e14..b2d2a0722 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/ToggleRepetitionCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 /**
  * Command to toggle a repetition.
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java
index a9e4f608c..af260d3bb 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/commands/package-info.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java
similarity index 89%
rename from uhabits-core/src/main/java/org/isoron/uhabits/commands/package-info.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java
index 8fce85ae1..848a9e284 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/commands/package-info.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java
@@ -19,6 +19,6 @@
 
 /**
  * Provides commands to modify the models, such as {@link
- * org.isoron.uhabits.commands.CreateHabitCommand}.
+ * org.isoron.uhabits.core.commands.CreateHabitCommand}.
  */
-package org.isoron.uhabits.commands;
\ No newline at end of file
+package org.isoron.uhabits.core.commands;
\ No newline at end of file
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java
index d89413d2f..9665332fe 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.io;
+package org.isoron.uhabits.core.io;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.text.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Checkmark.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Checkmark.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java
index 85084c743..1075d4b4a 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Checkmark.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/CheckmarkList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/CheckmarkList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
index 31a09b921..008191611 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/CheckmarkList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.text.*;
@@ -29,7 +29,7 @@ import java.util.*;
 
 import javax.annotation.concurrent.*;
 
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 /**
  * The collection of {@link Checkmark}s belonging to a habit.
  */
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Frequency.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Frequency.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java
index b21349b18..d12ff8ad2 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Frequency.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Habit.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
similarity index 99%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Habit.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
index e7b4d412e..0afcacb34 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Habit.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
@@ -28,7 +28,7 @@ import java.util.*;
 import javax.annotation.concurrent.*;
 import javax.inject.*;
 
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 
 /**
  * The thing that the user wants to track.
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/HabitList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
index 52c00a893..cf49b4ba0 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
 import com.opencsv.*;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitMatcher.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java
index 17198f279..d3d536b04 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitMatcherBuilder.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/HabitMatcherBuilder.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java
index c6cbd0dc4..68a9daf8b 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitMatcherBuilder.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitNotFoundException.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/HabitNotFoundException.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java
index 74302e2ad..c40204a1e 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/HabitNotFoundException.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 public class HabitNotFoundException extends RuntimeException {
     public HabitNotFoundException() {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/ModelFactory.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/ModelFactory.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
index 2556b9755..5c6a548c1 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/ModelFactory.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 /**
  * Interface implemented by factories that provide concrete implementations of
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/ModelObservable.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/ModelObservable.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java
index 6ab80813b..7d8f94377 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/ModelObservable.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Reminder.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Reminder.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java
index 88d54e293..3fb0bd1b9 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Reminder.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Repetition.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Repetition.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
index 274fe3517..3d04328d0 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Repetition.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/RepetitionList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/RepetitionList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
index ec355267c..8d237221f 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/RepetitionList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Score.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Score.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java
index fcfc8b56a..71739f34a 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Score.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/ScoreList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
similarity index 99%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/ScoreList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
index 1afb19be2..229959fca 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/ScoreList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.text.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/Streak.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/Streak.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java
index 5a7a59f3d..aff58c180 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/Streak.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 public final class Streak
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/StreakList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/StreakList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java
index 1176aa71c..ae2bc3032 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/StreakList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/WeekdayList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/WeekdayList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java
index f6cbe4560..64aff772f 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/WeekdayList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryCheckmarkList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryCheckmarkList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java
index 5b02be26a..ec847acc5 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryCheckmarkList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.memory;
+package org.isoron.uhabits.core.models.memory;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryHabitList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryHabitList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
index 32f1982c4..58ec38fe0 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryHabitList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.memory;
+package org.isoron.uhabits.core.models.memory;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 
 /**
  * In-memory implementation of {@link HabitList}.
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryModelFactory.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
similarity index 93%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryModelFactory.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
index 0a934d97a..bbb67a1b0 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryModelFactory.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.memory;
+package org.isoron.uhabits.core.models.memory;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
 
 import dagger.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryRepetitionList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryRepetitionList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
index cf1772e0b..2d7c81fea 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryRepetitionList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.memory;
+package org.isoron.uhabits.core.models.memory;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryScoreList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryScoreList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java
index b4ddc9fec..66e228d3f 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryScoreList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.memory;
+package org.isoron.uhabits.core.models.memory;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryStreakList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryStreakList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java
index 31fd3de8d..1cadf75c2 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/MemoryStreakList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.memory;
+package org.isoron.uhabits.core.models.memory;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/package-info.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/memory/package-info.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java
index f8272f334..0f45cc6bc 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/memory/package-info.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java
@@ -20,4 +20,4 @@
 /**
  * Provides in-memory implementation of core models.
  */
-package org.isoron.uhabits.models.memory;
\ No newline at end of file
+package org.isoron.uhabits.core.models.memory;
\ No newline at end of file
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/models/package-info.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java
similarity index 87%
rename from uhabits-core/src/main/java/org/isoron/uhabits/models/package-info.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java
index 9cb029b90..baef7f609 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/models/package-info.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java
@@ -18,7 +18,7 @@
  */
 
 /**
- * Provides core models classes, such as {@link org.isoron.uhabits.models.Habit}
- * and {@link org.isoron.uhabits.models.Repetition}.
+ * Provides core models classes, such as {@link org.isoron.uhabits.core.models.Habit}
+ * and {@link org.isoron.uhabits.core.models.Repetition}.
  */
-package org.isoron.uhabits.models;
\ No newline at end of file
+package org.isoron.uhabits.core.models;
\ No newline at end of file
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/preferences/Preferences.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/preferences/Preferences.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
index e39e67540..154e06333 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/preferences/Preferences.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.preferences;
+package org.isoron.uhabits.core.preferences;
 
 public interface Preferences
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java
index a869848fb..38c2f7f84 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.io.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.io.*;
+import org.isoron.uhabits.core.models.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java
index 245d76d30..748b8521d 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 public class SingleThreadTaskRunner implements TaskRunner
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/Task.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/tasks/Task.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java
index a1b69098a..3531a6314 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/Task.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import android.support.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java
index c5c38d7c0..ec2a4486e 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 public interface TaskRunner
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/NotificationTray.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java
similarity index 91%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/NotificationTray.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java
index df4a0509c..3a882f465 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/NotificationTray.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.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.core.ui;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 
 public interface NotificationTray
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/ThemeSwitcher.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/ThemeSwitcher.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
index 70f6e221f..b3d6db862 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/ThemeSwitcher.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui;
+package org.isoron.uhabits.core.ui;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.preferences.*;
+import org.isoron.uhabits.core.preferences.*;
 
 public abstract class ThemeSwitcher
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnColorPickedCallback.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnColorPickedCallback.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java
index 7cb86813a..b435c23c6 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnColorPickedCallback.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.callbacks;
+package org.isoron.uhabits.core.ui.callbacks;
 
 public interface OnColorPickedCallback
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnConfirmedCallback.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnConfirmedCallback.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java
index a543e01f9..3a51f0bca 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnConfirmedCallback.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.callbacks;
+package org.isoron.uhabits.core.ui.callbacks;
 
 public interface OnConfirmedCallback
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnFinishedCallback.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnFinishedCallback.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java
index 93efa29dc..6d0bdf8e5 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/callbacks/OnFinishedCallback.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.callbacks;
+package org.isoron.uhabits.core.ui.callbacks;
 
 public interface OnFinishedCallback
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/about/AboutBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/about/AboutBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java
index 233d791f7..996084e40 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/about/AboutBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.about;
+package org.isoron.uhabits.core.ui.screens.about;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.preferences.*;
+import org.isoron.uhabits.core.preferences.*;
 
 public class AboutBehavior
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/HabitCardListCache.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/HabitCardListCache.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
index ca77d7e7d..08afffcc7 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/HabitCardListCache.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/HintList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/HintList.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java
index fd5f48ef6..56bf7b23f 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/HintList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.utils.*;
 
 /**
  * Provides a list of hints to be shown at the application startup, and takes
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
index 374f88995..890a5c470 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsMenuBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsMenuBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
index e77938fb7..ba299158b 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsMenuBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
index 10d65f14e..36d21e9ea 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java
similarity index 92%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java
index d43be2a42..5b319957e 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.show;
+package org.isoron.uhabits.core.ui.screens.habits.show;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitMenuBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
similarity index 94%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitMenuBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
index a7f3e68b3..2c015b4b6 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitMenuBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.show;
+package org.isoron.uhabits.core.ui.screens.habits.show;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 
 import java.io.*;
 import java.util.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/ui/widgets/WidgetBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
similarity index 92%
rename from uhabits-core/src/main/java/org/isoron/uhabits/ui/widgets/WidgetBehavior.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
index d1d6090b6..217a7b6bc 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/ui/widgets/WidgetBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets;
+package org.isoron.uhabits.core.ui.widgets;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.*;
 
 import javax.inject.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/utils/ColorConstants.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java
similarity index 92%
rename from uhabits-core/src/main/java/org/isoron/uhabits/utils/ColorConstants.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java
index 294f3e6cd..0f4d97244 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/utils/ColorConstants.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java
@@ -1,4 +1,4 @@
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 public class ColorConstants
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/utils/DateFormats.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java
similarity index 97%
rename from uhabits-core/src/main/java/org/isoron/uhabits/utils/DateFormats.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java
index dc1df5231..755fe54e5 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/utils/DateFormats.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import android.support.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/utils/DateUtils.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java
similarity index 99%
rename from uhabits-core/src/main/java/org/isoron/uhabits/utils/DateUtils.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java
index cb0f20fbe..59dc12f19 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/utils/DateUtils.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java
index 44283af94..1ddacdade 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.*;
 
 import java.util.*;
 import java.util.concurrent.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/utils/StringUtils.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/utils/StringUtils.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java
index 2a22c78b6..2d8b3b7f7 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/utils/StringUtils.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import java.math.*;
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java
index 7c34632fa..384eadbb4 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java
@@ -19,11 +19,11 @@
 
 package org.isoron.uhabits;
 
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.models.memory.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.memory.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 import org.mockito.junit.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/ArchiveHabitsCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java
similarity index 95%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/ArchiveHabitsCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java
index dd0b9e53c..fc2df1508 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/ArchiveHabitsCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/ChangeHabitColorCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java
similarity index 96%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/ChangeHabitColorCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java
index 88716a22a..790aa259e 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/ChangeHabitColorCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/CreateHabitCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java
similarity index 96%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/CreateHabitCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java
index ac812e560..9237b04b5 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/CreateHabitCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import static junit.framework.Assert.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/CreateRepetitionCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java
similarity index 92%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/CreateRepetitionCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java
index 01426474a..f82d0ad0c 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/CreateRepetitionCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java
@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.isoron.uhabits.models.Checkmark.CHECKED_EXPLICITLY;
+import static org.isoron.uhabits.core.models.Checkmark.CHECKED_EXPLICITLY;
 
 public class CreateRepetitionCommandTest extends BaseUnitTest
 {
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/DeleteHabitsCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java
similarity index 96%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/DeleteHabitsCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java
index 17fafab36..77d3e0523 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/DeleteHabitsCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.rules.*;
 
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/EditHabitCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java
similarity index 97%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/EditHabitCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java
index 185f4b94f..003cdf6bd 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/EditHabitCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import static org.hamcrest.MatcherAssert.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/ToggleRepetitionCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
similarity index 94%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/ToggleRepetitionCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
index 3ce74245a..554d631d7 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/ToggleRepetitionCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import static junit.framework.Assert.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/commands/UnarchiveHabitsCommandTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java
similarity index 96%
rename from uhabits-core/src/test/java/org/isoron/uhabits/commands/UnarchiveHabitsCommandTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java
index 4f12101b9..81c1d2465 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/commands/UnarchiveHabitsCommandTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/CheckmarkListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java
similarity index 97%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/CheckmarkListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java
index 7bc708d96..b510d8fad 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/CheckmarkListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java
@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.io.*;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 
 public class CheckmarkListTest extends BaseUnitTest
 {
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/HabitFixtures.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitFixtures.java
similarity index 97%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/HabitFixtures.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitFixtures.java
index 29afe1aab..87066ed6a 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/HabitFixtures.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitFixtures.java
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 public class HabitFixtures
 {
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/HabitListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
similarity index 98%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/HabitListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
index ef31ce056..ee1c70e92 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/HabitListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.hamcrest.*;
 import org.isoron.uhabits.*;
@@ -27,7 +27,7 @@ import java.io.*;
 import java.util.*;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 import static org.junit.Assert.*;
 
 @SuppressWarnings("JavaDoc")
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/HabitTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
similarity index 98%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/HabitTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
index 3c11e1101..95d57f6d5 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/HabitTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
 import org.junit.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/RepetitionListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
similarity index 98%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/RepetitionListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
index edba652c2..fe456e761 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/RepetitionListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/ScoreListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
similarity index 98%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/ScoreListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
index e27ade824..2ad2c2893 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/ScoreListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.io.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/ScoreTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java
similarity index 95%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/ScoreTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java
index c794bbf35..6a90a406c 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/ScoreTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
 import org.junit.*;
 
 import static org.hamcrest.number.IsCloseTo.*;
-import static org.isoron.uhabits.models.Score.*;
+import static org.isoron.uhabits.core.models.Score.*;
 import static org.junit.Assert.*;
 
 public class ScoreTest extends BaseUnitTest
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/StreakListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java
similarity index 98%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/StreakListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java
index 8bf4fc78a..0f9571e2f 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/StreakListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/models/WeekdayListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java
similarity index 97%
rename from uhabits-core/src/test/java/org/isoron/uhabits/models/WeekdayListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java
index 142cb7082..efe83798c 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/models/WeekdayListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
 import org.junit.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/tasks/SingleThreadTaskRunnerTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java
similarity index 97%
rename from uhabits-core/src/test/java/org/isoron/uhabits/tasks/SingleThreadTaskRunnerTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java
index 95d3019d6..3f7e3090e 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/tasks/SingleThreadTaskRunnerTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import org.isoron.uhabits.*;
 import org.junit.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/HabitCardListCacheTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java
similarity index 96%
rename from uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/HabitCardListCacheTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java
index 9fdda511e..abad82464 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/HabitCardListCacheTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import junit.framework.Assert;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.Test;
 
 import java.util.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/HintListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java
similarity index 93%
rename from uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/HintListTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java
index 24271923e..f7509b1a0 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/HintListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.mockito.*;
 
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsBehaviorTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java
similarity index 94%
rename from uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsBehaviorTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java
index 58f9d6224..6fbef66cf 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsBehaviorTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.mockito.*;
 
@@ -32,7 +32,7 @@ import static java.nio.file.Files.*;
 import static junit.framework.TestCase.assertTrue;
 import static org.apache.commons.io.FileUtils.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.isoron.uhabits.ui.screens.habits.list.ListHabitsBehavior.Message.*;
+import static org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.any;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
similarity index 95%
rename from uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
index dc3bcd293..af71677a3 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
@@ -17,19 +17,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 import org.junit.*;
 import org.mockito.*;
 
 import static junit.framework.TestCase.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 import static org.mockito.Mockito.*;
 
 public class ListHabitsMenuBehaviorTest extends BaseUnitTest
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
similarity index 97%
rename from uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
index ccf6b39ac..3e2632b5b 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 import org.junit.*;
 import org.mockito.*;
 
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
similarity index 95%
rename from uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
index 351636681..b0ca4d0ba 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.show;
+package org.isoron.uhabits.core.ui.screens.habits.show;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import java.io.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/utils/DateUtilsTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java
similarity index 99%
rename from uhabits-core/src/test/java/org/isoron/uhabits/utils/DateUtilsTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java
index ed32cbeab..963559054 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/utils/DateUtilsTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import org.isoron.uhabits.*;
 import org.junit.*;