diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4225645..6f24fec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,7 @@
         </service>
 
         <activity
-            android:name=".timers.ui.EditTimerActivity"
+            android:name=".timers.EditTimerActivity"
             android:label="@string/title_activity_create_timer"
             android:parentActivityName=".MainActivity"
             android:windowSoftInputMode="adjustNothing">
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/Alarm.java b/app/src/main/java/com/philliphsu/clock2/alarms/Alarm.java
index 44e8b5a..7f363ff 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/Alarm.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/Alarm.java
@@ -4,7 +4,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.google.auto.value.AutoValue;
-import com.philliphsu.clock2.model.ObjectWithId;
+import com.philliphsu.clock2.data.ObjectWithId;
 
 import org.json.JSONObject;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmCursor.java b/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmCursor.java
index e9f1f37..f23c217 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmCursor.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmCursor.java
@@ -3,7 +3,7 @@ package com.philliphsu.clock2.alarms.data;
 import android.database.Cursor;
 
 import com.philliphsu.clock2.alarms.Alarm;
-import com.philliphsu.clock2.model.BaseItemCursor;
+import com.philliphsu.clock2.data.BaseItemCursor;
 
 import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.FRIDAY;
 import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.MONDAY;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsListCursorLoader.java b/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsListCursorLoader.java
index ce0b133..443e2a3 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsListCursorLoader.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsListCursorLoader.java
@@ -3,7 +3,7 @@ package com.philliphsu.clock2.alarms.data;
 import android.content.Context;
 
 import com.philliphsu.clock2.alarms.Alarm;
-import com.philliphsu.clock2.model.SQLiteCursorLoader;
+import com.philliphsu.clock2.data.SQLiteCursorLoader;
 
 /**
  * Created by Phillip Hsu on 6/28/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsTableManager.java b/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsTableManager.java
index 7b81702..9541aef 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsTableManager.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/data/AlarmsTableManager.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.database.Cursor;
 
 import com.philliphsu.clock2.alarms.Alarm;
-import com.philliphsu.clock2.model.DatabaseTableManager;
+import com.philliphsu.clock2.data.DatabaseTableManager;
 
 import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.FRIDAY;
 import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.MONDAY;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java
index 0c0da25..e6cc9ca 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.support.design.widget.Snackbar;
 import android.view.View;
 
-import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
+import com.philliphsu.clock2.data.AsyncDatabaseTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.alarms.Alarm;
 import com.philliphsu.clock2.list.ScrollHandler;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java
index eac9d30..eab231b 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java
@@ -16,7 +16,7 @@ import android.view.ViewGroup;
 
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.list.RecyclerViewFragment;
-import com.philliphsu.clock2.TimePickerDialogController;
+import com.philliphsu.clock2.dialogs.TimePickerDialogController;
 import com.philliphsu.clock2.alarms.Alarm;
 import com.philliphsu.clock2.alarms.data.AlarmsListCursorLoader;
 import com.philliphsu.clock2.alarms.data.AsyncAlarmsTableUpdateHandler;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
index fe95cbc..2aa9736 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
@@ -24,7 +24,7 @@ import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.list.BaseViewHolder;
 import com.philliphsu.clock2.list.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.TimePickerDialogController;
+import com.philliphsu.clock2.dialogs.TimePickerDialogController;
 import com.philliphsu.clock2.timepickers.Utils;
 import com.philliphsu.clock2.timepickers.BaseTimePickerDialog.OnTimeSetListener;
 import com.philliphsu.clock2.util.TimeTextUtils;
diff --git a/app/src/main/java/com/philliphsu/clock2/BaseChronometer.java b/app/src/main/java/com/philliphsu/clock2/chronometer/BaseChronometer.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/BaseChronometer.java
rename to app/src/main/java/com/philliphsu/clock2/chronometer/BaseChronometer.java
index 3cd6772..3693a90 100644
--- a/app/src/main/java/com/philliphsu/clock2/BaseChronometer.java
+++ b/app/src/main/java/com/philliphsu/clock2/chronometer/BaseChronometer.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.chronometer;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java b/app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerDelegate.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java
rename to app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerDelegate.java
index 1331ba4..b8210bd 100644
--- a/app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java
+++ b/app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerDelegate.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.chronometer;
 
 import android.content.res.Resources;
 import android.os.SystemClock;
@@ -10,6 +10,8 @@ import android.text.format.DateUtils;
 import android.text.style.RelativeSizeSpan;
 import android.util.Log;
 
+import com.philliphsu.clock2.R;
+
 import java.util.Formatter;
 import java.util.IllegalFormatException;
 import java.util.Locale;
diff --git a/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationService.java b/app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerNotificationService.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/ChronometerNotificationService.java
rename to app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerNotificationService.java
index 6399679..0bb4b92 100644
--- a/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerNotificationService.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.chronometer;
 
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -13,6 +13,8 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.util.SimpleArrayMap;
 
+import com.philliphsu.clock2.R;
+
 /**
  * Created by Phillip Hsu on 9/10/2016.
  */
diff --git a/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationThread.java b/app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerNotificationThread.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/ChronometerNotificationThread.java
rename to app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerNotificationThread.java
index 65c1963..0ad680e 100644
--- a/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationThread.java
+++ b/app/src/main/java/com/philliphsu/clock2/chronometer/ChronometerNotificationThread.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.chronometer;
 
 import android.annotation.SuppressLint;
 import android.app.NotificationManager;
diff --git a/app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/data/AsyncDatabaseTableUpdateHandler.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java
rename to app/src/main/java/com/philliphsu/clock2/data/AsyncDatabaseTableUpdateHandler.java
index dcbd243..7f7fb91 100644
--- a/app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java
+++ b/app/src/main/java/com/philliphsu/clock2/data/AsyncDatabaseTableUpdateHandler.java
@@ -1,11 +1,9 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.data;
 
 import android.content.Context;
 import android.os.AsyncTask;
 
 import com.philliphsu.clock2.list.ScrollHandler;
-import com.philliphsu.clock2.model.DatabaseTableManager;
-import com.philliphsu.clock2.model.ObjectWithId;
 
 /**
  * Created by Phillip Hsu on 7/1/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/model/BaseItemCursor.java b/app/src/main/java/com/philliphsu/clock2/data/BaseItemCursor.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/model/BaseItemCursor.java
rename to app/src/main/java/com/philliphsu/clock2/data/BaseItemCursor.java
index 28067d1..36f2839 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/BaseItemCursor.java
+++ b/app/src/main/java/com/philliphsu/clock2/data/BaseItemCursor.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.data;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
diff --git a/app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java b/app/src/main/java/com/philliphsu/clock2/data/ClockAppDatabaseHelper.java
similarity index 97%
rename from app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java
rename to app/src/main/java/com/philliphsu/clock2/data/ClockAppDatabaseHelper.java
index ebb13d5..2a5b0de 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/ClockAppDatabaseHelper.java
+++ b/app/src/main/java/com/philliphsu/clock2/data/ClockAppDatabaseHelper.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.data;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/com/philliphsu/clock2/model/DatabaseTableManager.java b/app/src/main/java/com/philliphsu/clock2/data/DatabaseTableManager.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/model/DatabaseTableManager.java
rename to app/src/main/java/com/philliphsu/clock2/data/DatabaseTableManager.java
index 1c26b29..303931b 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/DatabaseTableManager.java
+++ b/app/src/main/java/com/philliphsu/clock2/data/DatabaseTableManager.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.data;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/app/src/main/java/com/philliphsu/clock2/model/ObjectWithId.java b/app/src/main/java/com/philliphsu/clock2/data/ObjectWithId.java
similarity index 90%
rename from app/src/main/java/com/philliphsu/clock2/model/ObjectWithId.java
rename to app/src/main/java/com/philliphsu/clock2/data/ObjectWithId.java
index 09c9020..65f611b 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/ObjectWithId.java
+++ b/app/src/main/java/com/philliphsu/clock2/data/ObjectWithId.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.data;
 
 /**
  * Created by Phillip Hsu on 7/29/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/model/SQLiteCursorLoader.java b/app/src/main/java/com/philliphsu/clock2/data/SQLiteCursorLoader.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/model/SQLiteCursorLoader.java
rename to app/src/main/java/com/philliphsu/clock2/data/SQLiteCursorLoader.java
index 725ab87..9922159 100644
--- a/app/src/main/java/com/philliphsu/clock2/model/SQLiteCursorLoader.java
+++ b/app/src/main/java/com/philliphsu/clock2/data/SQLiteCursorLoader.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.model;
+package com.philliphsu.clock2.data;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java b/app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java
index b253093..5d5c6aa 100644
--- a/app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.content.Context;
 import android.preference.PreferenceManager;
@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 import android.util.Log;
 
-import com.philliphsu.clock2.dialogs.DialogFragmentController;
+import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
 import com.philliphsu.clock2.timepickers.NumberGridTimePickerDialog;
 import com.philliphsu.clock2.timepickers.NumpadTimePickerDialog;
diff --git a/app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java
index a8f51ef..b56bef3 100644
--- a/app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java
+++ b/app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java
@@ -4,8 +4,8 @@ import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.ViewGroup;
 
-import com.philliphsu.clock2.model.BaseItemCursor;
-import com.philliphsu.clock2.model.ObjectWithId;
+import com.philliphsu.clock2.data.BaseItemCursor;
+import com.philliphsu.clock2.data.ObjectWithId;
 
 /**
  * Created by Phillip Hsu on 7/29/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java b/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java
index 40028d7..3839b74 100644
--- a/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java
@@ -17,8 +17,8 @@ import android.widget.TextView;
 import com.philliphsu.clock2.BaseFragment;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.timepickers.Utils;
-import com.philliphsu.clock2.model.BaseItemCursor;
-import com.philliphsu.clock2.model.ObjectWithId;
+import com.philliphsu.clock2.data.BaseItemCursor;
+import com.philliphsu.clock2.data.ObjectWithId;
 
 import butterknife.Bind;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/Lap.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/Lap.java
index 4ec6f8a..cc2ac22 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/Lap.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/Lap.java
@@ -2,7 +2,7 @@ package com.philliphsu.clock2.stopwatch;
 
 import android.os.SystemClock;
 
-import com.philliphsu.clock2.model.ObjectWithId;
+import com.philliphsu.clock2.data.ObjectWithId;
 
 /**
  * Created by Phillip Hsu on 8/8/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java
index 1f087f3..0bbca75 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java
@@ -9,10 +9,10 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import com.philliphsu.clock2.ChronometerNotificationService;
+import com.philliphsu.clock2.chronometer.ChronometerNotificationService;
 import com.philliphsu.clock2.MainActivity;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.ChronometerDelegate;
+import com.philliphsu.clock2.chronometer.ChronometerDelegate;
 import com.philliphsu.clock2.stopwatch.data.AsyncLapsTableUpdateHandler;
 import com.philliphsu.clock2.stopwatch.ui.StopwatchFragment;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/AsyncLapsTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/AsyncLapsTableUpdateHandler.java
index 34cfd2d..c41699d 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/AsyncLapsTableUpdateHandler.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/AsyncLapsTableUpdateHandler.java
@@ -3,7 +3,7 @@ package com.philliphsu.clock2.stopwatch.data;
 import android.content.Context;
 import android.content.Intent;
 
-import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
+import com.philliphsu.clock2.data.AsyncDatabaseTableUpdateHandler;
 import com.philliphsu.clock2.list.ScrollHandler;
 import com.philliphsu.clock2.stopwatch.Lap;
 import com.philliphsu.clock2.stopwatch.StopwatchNotificationService;
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapCursor.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapCursor.java
index bbc5975..20d9017 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapCursor.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapCursor.java
@@ -2,7 +2,7 @@ package com.philliphsu.clock2.stopwatch.data;
 
 import android.database.Cursor;
 
-import com.philliphsu.clock2.model.BaseItemCursor;
+import com.philliphsu.clock2.data.BaseItemCursor;
 import com.philliphsu.clock2.stopwatch.Lap;
 
 /**
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsCursorLoader.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsCursorLoader.java
index f3bb8c3..366821d 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsCursorLoader.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsCursorLoader.java
@@ -2,18 +2,15 @@ package com.philliphsu.clock2.stopwatch.data;
 
 import android.content.Context;
 
-import com.philliphsu.clock2.model.SQLiteCursorLoader;
+import com.philliphsu.clock2.data.SQLiteCursorLoader;
 import com.philliphsu.clock2.stopwatch.Lap;
-import com.philliphsu.clock2.stopwatch.data.LapCursor;
-import com.philliphsu.clock2.stopwatch.data.LapsTableManager;
 
 /**
  * Created by Phillip Hsu on 8/9/2016.
  */
 public class LapsCursorLoader extends SQLiteCursorLoader<Lap, LapCursor> {
     public static final String ACTION_CHANGE_CONTENT
-            // TODO: Correct package prefix
-            = "com.philliphsu.clock2.model.LapsCursorLoader.action.CHANGE_CONTENT";
+            = "com.philliphsu.clock2.stopwatch.data.action.CHANGE_CONTENT";
 
     public LapsCursorLoader(Context context) {
         super(context);
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsTableManager.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsTableManager.java
index 9138d9a..d490099 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsTableManager.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsTableManager.java
@@ -4,7 +4,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 
-import com.philliphsu.clock2.model.DatabaseTableManager;
+import com.philliphsu.clock2.data.DatabaseTableManager;
 import com.philliphsu.clock2.stopwatch.Lap;
 
 /**
diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/ui/ChronometerWithMillis.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/ui/ChronometerWithMillis.java
index 8f85cca..f595560 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/ui/ChronometerWithMillis.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/ui/ChronometerWithMillis.java
@@ -20,7 +20,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.philliphsu.clock2.BaseChronometer;
+import com.philliphsu.clock2.chronometer.BaseChronometer;
 
 /**
  * Created by Phillip Hsu on 8/9/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java b/app/src/main/java/com/philliphsu/clock2/timers/EditTimerActivity.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java
rename to app/src/main/java/com/philliphsu/clock2/timers/EditTimerActivity.java
index ee4af7d..36b34c5 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/EditTimerActivity.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.timers.ui;
+package com.philliphsu.clock2.timers;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/Timer.java b/app/src/main/java/com/philliphsu/clock2/timers/Timer.java
index 053d575..4d87a0f 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/Timer.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/Timer.java
@@ -5,7 +5,7 @@ import android.os.Parcelable;
 import android.os.SystemClock;
 
 import com.google.auto.value.AutoValue;
-import com.philliphsu.clock2.model.ObjectWithId;
+import com.philliphsu.clock2.data.ObjectWithId;
 
 import java.util.concurrent.TimeUnit;
 
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 8dfdbdb..a1aa78a 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
@@ -9,7 +9,7 @@ import android.support.v4.util.SimpleArrayMap;
 import android.util.Log;
 
 import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
-import com.philliphsu.clock2.ChronometerNotificationService;
+import com.philliphsu.clock2.chronometer.ChronometerNotificationService;
 import com.philliphsu.clock2.MainActivity;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.timers.data.TimerCursor;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
index 5e45d93..6ce4a1d 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
+import com.philliphsu.clock2.data.AsyncDatabaseTableUpdateHandler;
 import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.list.ScrollHandler;
 import com.philliphsu.clock2.timers.TimerNotificationService;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
index 6cb8637..05e7cb5 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
@@ -3,7 +3,7 @@ package com.philliphsu.clock2.timers.data;
 import android.database.Cursor;
 
 import com.philliphsu.clock2.timers.Timer;
-import com.philliphsu.clock2.model.BaseItemCursor;
+import com.philliphsu.clock2.data.BaseItemCursor;
 
 /**
  * Created by Phillip Hsu on 7/30/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
index 9a4e596..e08cf65 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
@@ -3,7 +3,7 @@ package com.philliphsu.clock2.timers.data;
 import android.content.Context;
 
 import com.philliphsu.clock2.timers.Timer;
-import com.philliphsu.clock2.model.SQLiteCursorLoader;
+import com.philliphsu.clock2.data.SQLiteCursorLoader;
 
 /**
  * Created by Phillip Hsu on 7/29/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
index 61c52cd..0b4ea3b 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
@@ -7,7 +7,7 @@ import android.os.SystemClock;
 import android.util.Log;
 
 import com.philliphsu.clock2.timers.Timer;
-import com.philliphsu.clock2.model.DatabaseTableManager;
+import com.philliphsu.clock2.data.DatabaseTableManager;
 
 /**
  * Created by Phillip Hsu on 7/30/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
index 2e9abb4..0355f2e 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
@@ -20,7 +20,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.philliphsu.clock2.BaseChronometer;
+import com.philliphsu.clock2.chronometer.BaseChronometer;
 
 /**
  * Created by Phillip Hsu on 7/25/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
index 011bd5c..73511b2 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
@@ -14,6 +14,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.philliphsu.clock2.timers.EditTimerActivity;
 import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.list.RecyclerViewFragment;
diff --git a/app/src/main/res/layout-land/activity_edit_timer.xml b/app/src/main/res/layout-land/activity_edit_timer.xml
index abd8251..f6a5d8c 100644
--- a/app/src/main/res/layout-land/activity_edit_timer.xml
+++ b/app/src/main/res/layout-land/activity_edit_timer.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".timers.ui.EditTimerActivity">
+    tools:context=".timers.EditTimerActivity">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_edit_timer.xml b/app/src/main/res/layout/activity_edit_timer.xml
index 699ded0..34806a0 100644
--- a/app/src/main/res/layout/activity_edit_timer.xml
+++ b/app/src/main/res/layout/activity_edit_timer.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".timers.ui.EditTimerActivity">
+    tools:context=".timers.EditTimerActivity">
     
     <RelativeLayout
         android:id="@+id/edit_fields_layout"