Rename uhabits-core package

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.*;
 

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
 {}

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.*;
 

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.*;
 

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

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.*;
 

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.

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.

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.*;
 

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.

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.

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.*;
 

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;
+package org.isoron.uhabits.core.commands;

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.*;

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.*;
 

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.
  */

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.*;
 

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.

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.*;

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.*;
 

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.*;
 

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() {

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

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.*;
 

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.*;
 

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.*;
 

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.*;
 

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.*;
 

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.*;

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
 {

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.*;
 

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.*;
 

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.*;
 

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}.

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.*;
 

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.*;
 

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.*;
 

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.*;
 

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;
+package org.isoron.uhabits.core.models.memory;

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;
+package org.isoron.uhabits.core.models;

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
 {

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.*;

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
 {

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.*;
 

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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.*;
 

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

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.*;

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.*;
 

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.*;
 

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.*;
 

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.*;

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.*;
 

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
 {

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.*;
 

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.*;
 

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.*;

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.*;

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.*;

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.*;

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.*;

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.*;

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
 {

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.*;
 

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.*;

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.*;

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.*;

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
 {

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
 {

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")

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.*;

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.*;

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.*;

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

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.*;

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.*;

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.*;

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.*;

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.*;
 

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;

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

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.*;
 

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.*;

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.*;