diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1503fd3..4c3df4f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,7 @@
         </service>
 
         <activity
-            android:name=".edittimer.EditTimerActivity"
+            android:name=".timers.ui.EditTimerActivity"
             android:label="@string/title_activity_create_timer"
             android:parentActivityName=".MainActivity"
             android:windowSoftInputMode="adjustNothing">
diff --git a/app/src/main/java/com/philliphsu/clock2/BaseChronometer.java b/app/src/main/java/com/philliphsu/clock2/BaseChronometer.java
index 179b9c6..3cd6772 100644
--- a/app/src/main/java/com/philliphsu/clock2/BaseChronometer.java
+++ b/app/src/main/java/com/philliphsu/clock2/BaseChronometer.java
@@ -8,8 +8,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.timers.ChronometerDelegate;
-
 /**
  * Created by Phillip Hsu on 9/9/2016.
  *
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/ChronometerDelegate.java b/app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/timers/ChronometerDelegate.java
rename to app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java
index a69b0df..1331ba4 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/ChronometerDelegate.java
+++ b/app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.timers;
+package com.philliphsu.clock2;
 
 import android.content.res.Resources;
 import android.os.SystemClock;
@@ -10,8 +10,6 @@ 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/ChronometerNotificationService.java
index 155a8b5..6399679 100644
--- a/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationService.java
@@ -13,8 +13,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.util.SimpleArrayMap;
 
-import com.philliphsu.clock2.timers.ChronometerDelegate;
-
 /**
  * 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/ChronometerNotificationThread.java
index 83429fc..65c1963 100644
--- a/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationThread.java
+++ b/app/src/main/java/com/philliphsu/clock2/ChronometerNotificationThread.java
@@ -11,8 +11,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 
-import com.philliphsu.clock2.timers.ChronometerDelegate;
-
 /**
  * Created by Phillip Hsu on 9/10/2016.
  *
diff --git a/app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
index 53ee38d..f638535 100644
--- a/app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
@@ -8,7 +8,7 @@ import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.timers.TimerController;
 import com.philliphsu.clock2.timers.TimerNotificationService;
 import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
diff --git a/app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java b/app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
index f6a9fe3..4e5f74a 100644
--- a/app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
@@ -8,12 +8,12 @@ import android.os.SystemClock;
 import android.support.v4.app.NotificationCompat;
 import android.view.ViewGroup;
 
-import com.philliphsu.clock2.timers.CountdownChronometer;
+import com.philliphsu.clock2.timers.ui.CountdownChronometer;
 import com.philliphsu.clock2.timers.TimerController;
 import com.philliphsu.clock2.timers.TimerNotificationService;
 import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 
 public class TimesUpActivity extends RingtoneActivity<Timer> {
     private static final String TAG = "TimesUpActivity";
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 3cfa5f0..06b306e 100644
--- a/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java
@@ -12,7 +12,7 @@ import android.util.Log;
 import com.philliphsu.clock2.ChronometerNotificationService;
 import com.philliphsu.clock2.MainActivity;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.timers.ChronometerDelegate;
+import com.philliphsu.clock2.ChronometerDelegate;
 
 public class StopwatchNotificationService extends ChronometerNotificationService {
     private static final String TAG = "StopwatchNotifService";
diff --git a/app/src/main/java/com/philliphsu/clock2/Timer.java b/app/src/main/java/com/philliphsu/clock2/timers/Timer.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/Timer.java
rename to app/src/main/java/com/philliphsu/clock2/timers/Timer.java
index c26fea4..053d575 100644
--- a/app/src/main/java/com/philliphsu/clock2/Timer.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/Timer.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.timers;
 
 import android.os.Parcel;
 import android.os.Parcelable;
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 bbc318a..18983cc 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerController.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerController.java
@@ -3,7 +3,6 @@ package com.philliphsu.clock2.timers;
 import android.util.Log;
 
 import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
-import com.philliphsu.clock2.Timer;
 
 /**
  * Created by Phillip Hsu on 7/27/2016.
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 5ff05f6..8dfdbdb 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
@@ -12,7 +12,6 @@ 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.timers.data.TimerCursor;
 import com.philliphsu.clock2.timers.ui.TimersFragment;
 
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 0714f39..5e45d93 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
@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.util.Log;
 
 import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.list.ScrollHandler;
 import com.philliphsu.clock2.timers.TimerNotificationService;
 import com.philliphsu.clock2.ringtone.TimesUpActivity;
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 53a0ada..6cb8637 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
@@ -2,7 +2,7 @@ package com.philliphsu.clock2.timers.data;
 
 import android.database.Cursor;
 
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.model.BaseItemCursor;
 
 /**
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 4319ac1..9a4e596 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
@@ -2,7 +2,7 @@ package com.philliphsu.clock2.timers.data;
 
 import android.content.Context;
 
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.model.SQLiteCursorLoader;
 
 /**
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 dee656f..61c52cd 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
@@ -6,7 +6,7 @@ import android.database.Cursor;
 import android.os.SystemClock;
 import android.util.Log;
 
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.model.DatabaseTableManager;
 
 /**
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/CountdownChronometer.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
similarity index 97%
rename from app/src/main/java/com/philliphsu/clock2/timers/CountdownChronometer.java
rename to app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
index 0cf3e0b..2e9abb4 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/CountdownChronometer.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.philliphsu.clock2.timers;
+package com.philliphsu.clock2.timers.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
rename to app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java
index 2263ad4..ee4af7d 100644
--- a/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.edittimer;
+package com.philliphsu.clock2.timers.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
index b2d3208..e194e7a 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
@@ -17,14 +17,13 @@ import android.widget.TextView;
 
 import com.philliphsu.clock2.dialogs.AddLabelDialog;
 import com.philliphsu.clock2.dialogs.AddLabelDialogController;
-import com.philliphsu.clock2.timers.CountdownChronometer;
 import com.philliphsu.clock2.timers.TimerController;
 import com.philliphsu.clock2.ringtone.TimerRingtoneService;
 import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.list.BaseViewHolder;
 import com.philliphsu.clock2.list.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.Timer;
+import com.philliphsu.clock2.timers.Timer;
 import com.philliphsu.clock2.util.FragmentTagUtils;
 import com.philliphsu.clock2.util.ProgressBarUtils;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
index 8763259..3a6dbc8 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
@@ -5,7 +5,7 @@ import android.view.ViewGroup;
 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.timers.Timer;
 import com.philliphsu.clock2.timers.data.TimerCursor;
 
 /**
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 fcd96ff..011bd5c 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
@@ -17,8 +17,7 @@ import android.view.ViewGroup;
 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.timers.Timer;
 import com.philliphsu.clock2.timers.data.TimerCursor;
 import com.philliphsu.clock2.timers.data.TimersListCursorLoader;
 
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 bde79df..abd8251 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="com.philliphsu.clock2.edittimer.EditTimerActivity">
+    tools:context=".timers.ui.EditTimerActivity">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout-land/item_timer.xml b/app/src/main/res/layout-land/item_timer.xml
index d90b118..1202b00 100644
--- a/app/src/main/res/layout-land/item_timer.xml
+++ b/app/src/main/res/layout-land/item_timer.xml
@@ -14,7 +14,7 @@
             android:id="@+id/label"
             style="@style/TimerLabel"/>
 
-        <com.philliphsu.clock2.timers.CountdownChronometer
+        <com.philliphsu.clock2.timers.ui.CountdownChronometer
             android:id="@+id/duration"
             android:layout_below="@id/label"
             style="@style/TimerText.Countdown"/>
diff --git a/app/src/main/res/layout/activity_edit_timer.xml b/app/src/main/res/layout/activity_edit_timer.xml
index 5ab9b0a..699ded0 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="com.philliphsu.clock2.edittimer.EditTimerActivity">
+    tools:context=".timers.ui.EditTimerActivity">
     
     <RelativeLayout
         android:id="@+id/edit_fields_layout"
diff --git a/app/src/main/res/layout/content_header_timesup_activity.xml b/app/src/main/res/layout/content_header_timesup_activity.xml
index ed79d71..0ac894e 100644
--- a/app/src/main/res/layout/content_header_timesup_activity.xml
+++ b/app/src/main/res/layout/content_header_timesup_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.philliphsu.clock2.timers.CountdownChronometer
+<com.philliphsu.clock2.timers.ui.CountdownChronometer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_timer.xml b/app/src/main/res/layout/item_timer.xml
index 2836879..56b6637 100644
--- a/app/src/main/res/layout/item_timer.xml
+++ b/app/src/main/res/layout/item_timer.xml
@@ -15,7 +15,7 @@
             android:id="@+id/label"
             style="@style/TimerLabel"/>
 
-        <com.philliphsu.clock2.timers.CountdownChronometer
+        <com.philliphsu.clock2.timers.ui.CountdownChronometer
             android:id="@+id/duration"
             android:layout_below="@id/label"
             style="@style/TimerText.Countdown"/>
diff --git a/app/src/test/java/com/philliphsu/clock2/DaysOfWeekTest.java b/app/src/test/java/com/philliphsu/clock2/alarms/misc/DaysOfWeekTest.java
similarity index 83%
rename from app/src/test/java/com/philliphsu/clock2/DaysOfWeekTest.java
rename to app/src/test/java/com/philliphsu/clock2/alarms/misc/DaysOfWeekTest.java
index 2a92767..a5fb015 100644
--- a/app/src/test/java/com/philliphsu/clock2/DaysOfWeekTest.java
+++ b/app/src/test/java/com/philliphsu/clock2/alarms/misc/DaysOfWeekTest.java
@@ -1,10 +1,14 @@
-package com.philliphsu.clock2;
-
-import com.philliphsu.clock2.alarms.misc.DaysOfWeek;
+package com.philliphsu.clock2.alarms.misc;
 
 import org.junit.Test;
 
-import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.*;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.FRIDAY;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.MONDAY;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.SATURDAY;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.SUNDAY;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.THURSDAY;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.TUESDAY;
+import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.WEDNESDAY;
 import static org.junit.Assert.assertEquals;
 
 /**