diff --git a/app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java b/app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java
index 8d10c1d..5c40263 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java
+++ b/app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java
@@ -6,6 +6,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 
 import com.philliphsu.clock2.alarms.data.AlarmsTable;
 import com.philliphsu.clock2.stopwatch.LapsTable;
+import com.philliphsu.clock2.timers.data.TimersTable;
 
 /**
  * Created by Phillip Hsu on 7/30/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerController.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerController.java
index e0f3995..bbc318a 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerController.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerController.java
@@ -2,7 +2,7 @@ package com.philliphsu.clock2.timers;
 
 import android.util.Log;
 
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.Timer;
 
 /**
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
index edaad82..a148fdd 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
@@ -8,12 +8,12 @@ import android.support.annotation.Nullable;
 import android.support.v4.util.SimpleArrayMap;
 import android.util.Log;
 
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.ChronometerNotificationService;
 import com.philliphsu.clock2.MainActivity;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.Timer;
-import com.philliphsu.clock2.model.TimerCursor;
+import com.philliphsu.clock2.timers.data.TimerCursor;
 
 /**
  * Handles the notification for an active Timer.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
index 0bade17..8968cfd 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
@@ -7,7 +7,7 @@ import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.Timer;
 import com.philliphsu.clock2.ringtone.RingtoneService;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
index 9081ec0..54bea7c 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
@@ -17,7 +17,7 @@ import android.widget.TextView;
 
 import com.philliphsu.clock2.dialogs.AddLabelDialog;
 import com.philliphsu.clock2.dialogs.AddLabelDialogController;
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.list.BaseViewHolder;
 import com.philliphsu.clock2.list.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java
index 7ae2d9e..83b9d48 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java
@@ -2,11 +2,11 @@ package com.philliphsu.clock2.timers;
 
 import android.view.ViewGroup;
 
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.list.BaseCursorAdapter;
 import com.philliphsu.clock2.list.OnListItemInteractionListener;
 import com.philliphsu.clock2.Timer;
-import com.philliphsu.clock2.model.TimerCursor;
+import com.philliphsu.clock2.timers.data.TimerCursor;
 
 /**
  * Created by Phillip Hsu on 7/29/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java b/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java
index d4ef9bb..c9b04e1 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java
@@ -14,13 +14,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.list.RecyclerViewFragment;
 import com.philliphsu.clock2.Timer;
 import com.philliphsu.clock2.edittimer.EditTimerActivity;
-import com.philliphsu.clock2.model.TimerCursor;
-import com.philliphsu.clock2.model.TimersListCursorLoader;
+import com.philliphsu.clock2.timers.data.TimerCursor;
+import com.philliphsu.clock2.timers.data.TimersListCursorLoader;
 
 import static butterknife.ButterKnife.findById;
 import static com.philliphsu.clock2.util.ConfigurationUtils.getOrientation;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
index 258daa8..765f5ca 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
@@ -8,7 +8,7 @@ import android.os.SystemClock;
 import android.support.v4.app.NotificationCompat;
 import android.view.ViewGroup;
 
-import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
+import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.Timer;
 import com.philliphsu.clock2.ringtone.RingtoneActivity;
diff --git a/app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java
rename to app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
index 87f2fd9..2f0238d 100644
--- a/app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.timers.data;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -6,8 +6,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
+import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
+import com.philliphsu.clock2.Timer;
 import com.philliphsu.clock2.list.ScrollHandler;
-import com.philliphsu.clock2.model.TimersTableManager;
 import com.philliphsu.clock2.timers.TimerNotificationService;
 import com.philliphsu.clock2.timers.TimesUpActivity;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/model/TimerCursor.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
similarity index 92%
rename from app/src/main/java/com/philliphsu/clock2/model/TimerCursor.java
rename to app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
index 9c29fec..53a0ada 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/TimerCursor.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
@@ -1,8 +1,9 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.timers.data;
 
 import android.database.Cursor;
 
 import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.model.BaseItemCursor;
 
 /**
  * Created by Phillip Hsu on 7/30/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/model/TimersListCursorLoader.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
similarity index 77%
rename from app/src/main/java/com/philliphsu/clock2/model/TimersListCursorLoader.java
rename to app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
index bf6c02a..4319ac1 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/TimersListCursorLoader.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
@@ -1,15 +1,16 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.timers.data;
 
 import android.content.Context;
 
 import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.model.SQLiteCursorLoader;
 
 /**
  * Created by Phillip Hsu on 7/29/2016.
  */
 public class TimersListCursorLoader extends SQLiteCursorLoader<Timer, TimerCursor> {
     public static final String ACTION_CHANGE_CONTENT
-            = "com.philliphsu.clock2.model.TimersListCursorLoader.action.CHANGE_CONTENT";
+            = "com.philliphsu.clock2.timers.data.action.CHANGE_CONTENT";
 
     public TimersListCursorLoader(Context context) {
         super(context);
diff --git a/app/src/main/java/com/philliphsu/clock2/model/TimersTable.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTable.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/model/TimersTable.java
rename to app/src/main/java/com/philliphsu/clock2/timers/data/TimersTable.java
index 6c692bb..ae6aa30 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/TimersTable.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTable.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.timers.data;
 
 import android.database.sqlite.SQLiteDatabase;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/model/TimersTableManager.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
similarity index 95%
rename from app/src/main/java/com/philliphsu/clock2/model/TimersTableManager.java
rename to app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
index e2f1877..dee656f 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/TimersTableManager.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.timers.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -7,6 +7,7 @@ import android.os.SystemClock;
 import android.util.Log;
 
 import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.model.DatabaseTableManager;
 
 /**
  * Created by Phillip Hsu on 7/30/2016.