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 b220e500d..8374d84d5 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
@@ -23,11 +23,11 @@ import android.app.*;
 import android.content.*;
 
 import org.isoron.androidbase.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.core.reminders.*;
 import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.core.ui.*;
-import org.isoron.uhabits.database.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;
 
@@ -92,7 +92,7 @@ public class HabitsApplication extends Application
         {
             DatabaseUtils.initializeDatabase(context);
         }
-        catch (InvalidDatabaseVersionException e)
+        catch (UnsupportedDatabaseVersionException e)
         {
             File db = DatabaseUtils.getDatabaseFile(context);
             db.renameTo(new File(db.getAbsolutePath() + ".invalid"));
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.java
index ffb43fc7f..573dc765f 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.java
@@ -24,18 +24,21 @@ package org.isoron.uhabits;
 import android.content.*;
 import android.database.sqlite.*;
 
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.database.*;
 
 
-public class HabitsDatabaseOpener extends BaseSQLiteOpenHelper
+public class HabitsDatabaseOpener extends SQLiteOpenHelper
 {
     private final int version;
 
+    private MigrationHelper helper;
+
     public HabitsDatabaseOpener(Context context,
                                 String databaseFilename,
                                 int version)
     {
-        super(context, databaseFilename, version);
+        super(context, databaseFilename, null, version);
         this.version = version;
     }
 
@@ -49,6 +52,13 @@ public class HabitsDatabaseOpener extends BaseSQLiteOpenHelper
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
     {
         if(oldVersion < 8) throw new UnsupportedDatabaseVersionException();
-        super.onUpgrade(db, oldVersion, newVersion);
+        helper = new MigrationHelper(new AndroidDatabase(db));
+        helper.executeMigrations(oldVersion, newVersion);
+    }
+
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion)
+    {
+        throw new UnsupportedDatabaseVersionException();
     }
 }
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 a00729b8a..a685e7083 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
@@ -77,7 +77,7 @@ public class HabitsModule
     public ModelFactory getModelFactory()
     {
         return new SQLModelFactory(
-            new AndroidSQLiteDatabase(DatabaseUtils.openDatabase()));
+            new AndroidDatabase(DatabaseUtils.openDatabase()));
     }
 
     @Provides
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.java b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.java
index 2531836a5..cbc8a6a58 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.java
@@ -21,7 +21,7 @@
 
 package org.isoron.uhabits.database;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 
 public class AndroidCursor implements Cursor
 {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidSQLiteDatabase.java b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.java
similarity index 95%
rename from uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidSQLiteDatabase.java
rename to uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.java
index b5513c0ff..237be7441 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidSQLiteDatabase.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.java
@@ -24,15 +24,15 @@ package org.isoron.uhabits.database;
 import android.content.*;
 import android.database.sqlite.*;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 
 import java.util.*;
 
-public class AndroidSQLiteDatabase implements Database
+public class AndroidDatabase implements Database
 {
     private final SQLiteDatabase db;
 
-    public AndroidSQLiteDatabase(SQLiteDatabase db)
+    public AndroidDatabase(SQLiteDatabase db)
     {
         this.db = db;
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/BaseSQLiteOpenHelper.java b/uhabits-android/src/main/java/org/isoron/uhabits/database/BaseSQLiteOpenHelper.java
deleted file mode 100644
index 6789670ec..000000000
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/BaseSQLiteOpenHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-package org.isoron.uhabits.database;
-
-import android.content.*;
-import android.database.sqlite.*;
-
-import org.isoron.androidbase.*;
-import org.isoron.uhabits.core.db.*;
-
-
-public class BaseSQLiteOpenHelper extends SQLiteOpenHelper
-{
-    private final Context context;
-
-    private final int version;
-
-    public BaseSQLiteOpenHelper(@AppContext Context context,
-                                String databaseFilename,
-                                int version)
-    {
-        super(context, databaseFilename, null, version);
-        this.context = context;
-        this.version = version;
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db)
-    {
-        MigrationHelper helper =
-            new MigrationHelper(new AndroidSQLiteDatabase(db));
-        helper.executeMigrations(-1, version);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
-    {
-        MigrationHelper helper =
-            new MigrationHelper(new AndroidSQLiteDatabase(db));
-        helper.executeMigrations(oldVersion, newVersion);
-    }
-
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion)
-    {
-        throw new UnsupportedDatabaseVersionException();
-    }
-}
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/InconsistentDatabaseException.java b/uhabits-android/src/main/java/org/isoron/uhabits/database/InconsistentDatabaseException.java
deleted file mode 100644
index 2775aa623..000000000
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/InconsistentDatabaseException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-package org.isoron.uhabits.database;
-
-public class InconsistentDatabaseException extends RuntimeException
-{
-    public InconsistentDatabaseException(String message)
-    {
-        super(message);
-    }
-}
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/InvalidDatabaseVersionException.java b/uhabits-android/src/main/java/org/isoron/uhabits/database/InvalidDatabaseVersionException.java
deleted file mode 100644
index 26af5d3a0..000000000
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/InvalidDatabaseVersionException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-package org.isoron.uhabits.database;
-
-public class InvalidDatabaseVersionException extends RuntimeException
-{
-}
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java b/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
index 037eb2dbf..dba845cf6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.sync;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 
 @Table(name = "Events")
 public class Event
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 80f5997d6..5d60009c8 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
@@ -26,7 +26,7 @@ import org.isoron.androidbase.*;
 import org.isoron.uhabits.BuildConfig;
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.commands.*;
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.database.*;
 import org.isoron.uhabits.utils.*;
@@ -115,7 +115,7 @@ public class SyncManager implements CommandRunner.Listener
         this.isListening = false;
 
         repository = new Repository<>(Event.class,
-            new AndroidSQLiteDatabase(DatabaseUtils.openDatabase()));
+            new AndroidDatabase(DatabaseUtils.openDatabase()));
         pendingConfirmation = new LinkedList<>();
         pendingEmit = new LinkedList<>(repository.findAll("order by timestamp"));
 
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 b82ec86a1..c1ec11755 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,7 +26,6 @@ import android.support.annotation.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.utils.*;
-import org.isoron.uhabits.database.*;
 
 import java.io.*;
 import java.text.*;
@@ -81,17 +80,8 @@ public abstract class DatabaseUtils
     @SuppressWarnings("unchecked")
     public static void initializeDatabase(Context context)
     {
-        try
-        {
-            opener = new HabitsDatabaseOpener(context, getDatabaseFilename(),
-                BuildConfig.databaseVersion);
-        }
-        catch (RuntimeException e)
-        {
-            if (e.getMessage().contains("downgrade"))
-                throw new InvalidDatabaseVersionException();
-            else throw e;
-        }
+        opener = new HabitsDatabaseOpener(context, getDatabaseFilename(),
+            BuildConfig.databaseVersion);
     }
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
@@ -113,7 +103,7 @@ public abstract class DatabaseUtils
     @NonNull
     public static SQLiteDatabase openDatabase()
     {
-        if(opener == null) throw new IllegalStateException();
+        if (opener == null) throw new IllegalStateException();
         return opener.getWritableDatabase();
     }
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Column.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/Column.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java
index 93e440a1c..be794b796 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Column.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import java.lang.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Cursor.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/Cursor.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
index ec13431d8..7e7ef0b67 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Cursor.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 public interface Cursor extends AutoCloseable
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Database.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
similarity index 96%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/Database.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
index 663ceaadd..92440773c 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Database.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import java.util.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/JdbcCursor.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/JdbcCursor.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
index ee5fdd808..94740f086 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/JdbcCursor.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import java.sql.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/JdbcDatabase.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
similarity index 99%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/JdbcDatabase.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
index a741b459e..b44ae48b5 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/JdbcDatabase.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import org.apache.commons.lang3.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/MigrationHelper.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java
similarity index 98%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/MigrationHelper.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java
index 973d8c022..4cf83f48a 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/MigrationHelper.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import android.support.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Repository.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java
similarity index 99%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/Repository.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java
index d3112386c..46c34cadb 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Repository.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import android.support.annotation.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/SQLParser.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java
similarity index 99%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/SQLParser.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java
index 439f02ba3..b2b5f593b 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/SQLParser.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Table.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java
similarity index 95%
rename from uhabits-core/src/main/java/org/isoron/uhabits/core/db/Table.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java
index 4906dfd00..fc8fd0a55 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/db/Table.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import java.lang.annotation.*;
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/UnsupportedDatabaseVersionException.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java
similarity index 95%
rename from uhabits-android/src/main/java/org/isoron/uhabits/database/UnsupportedDatabaseVersionException.java
rename to uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java
index aec1d8f2b..f3379fb0c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/UnsupportedDatabaseVersionException.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java
@@ -15,11 +15,9 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
 
-package org.isoron.uhabits.database;
+package org.isoron.uhabits.core.database;
 
 public class UnsupportedDatabaseVersionException extends RuntimeException
 {
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
index 6bfae61b7..d0be873e7 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
 
 /**
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
index 7e636f076..14367a39b 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.memory;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java
index 044703c23..702e8acff 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java
@@ -21,7 +21,7 @@
 
 package org.isoron.uhabits.core.models.sqlite;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.memory.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
index c5eaf9c29..bc12b972a 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
@@ -23,7 +23,7 @@ package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.memory.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
index fcb75ad54..3dd0690b3 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
@@ -24,7 +24,7 @@ package org.isoron.uhabits.core.models.sqlite;
 import android.support.annotation.*;
 import android.support.annotation.Nullable;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.memory.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java
index 076a36f30..b07916411 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java
@@ -22,7 +22,7 @@
 package org.isoron.uhabits.core.models.sqlite.records;
 
 import org.apache.commons.lang3.builder.*;
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 
 /**
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java
index b6dee41a0..30bc1958e 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java
@@ -21,7 +21,7 @@
 
 package org.isoron.uhabits.core.models.sqlite.records;
 
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 
 /**
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 1d49f8860..b9c83e84f 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java
@@ -20,7 +20,7 @@
 package org.isoron.uhabits;
 
 import org.isoron.uhabits.core.commands.*;
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.memory.*;
 import org.isoron.uhabits.core.tasks.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/core/db/RepositoryTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
similarity index 99%
rename from uhabits-core/src/test/java/org/isoron/uhabits/core/db/RepositoryTest.java
rename to uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
index 31247b6dc..d6ee90bf8 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/core/db/RepositoryTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.core.db;
+package org.isoron.uhabits.core.database;
 
 import org.apache.commons.lang3.builder.*;
 import org.isoron.uhabits.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
index 5f08bf60b..99c0023a6 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
@@ -22,7 +22,7 @@
 package org.isoron.uhabits.core.models.sqlite;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
 import org.junit.*;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
index 6f56eab63..43f9d165f 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.core.models.sqlite;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.sqlite.records.*;
 import org.isoron.uhabits.core.test.*;