11 files changed, 19 insertions, 15 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 66bc3fc7..7c0310ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -133,7 +133,7 @@
         <service android:name="DismissAllAlarmsService" />
 
         <!-- Declarations for the widget -->
-        <receiver android:name="CalendarAppWidgetReceiver" android:enabled="false">
+        <receiver android:name=".widget.CalendarAppWidgetReceiver" android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.TIMEZONE_CHANGED" />
                 <action android:name="android.intent.action.TIME_SET" />
@@ -145,7 +145,7 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name="CalendarAppWidgetProvider" android:label="@string/gadget_title">
+        <receiver android:name=".widget.CalendarAppWidgetProvider" android:label="@string/gadget_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.android.calendar.APPWIDGET_UPDATE" />
@@ -153,7 +153,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
 
-        <service android:name="CalendarAppWidgetService" />
+        <service android:name=".widget.CalendarAppWidgetService" />
 
         <activity android:name="CalendarTests" android:label="Calendar Tests">
             <intent-filter>
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 4e9bc504..96fe843d 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -20,7 +20,7 @@ import com.android.calendar.CalendarController.EventHandler;
 import com.android.calendar.CalendarController.EventInfo;
 import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarController.ViewType;
-import com.android.calendar.SelectCalendars.SelectCalendarsFragment;
+import com.android.calendar.selectcalendars.SelectCalendarsFragment;
 
 import android.app.ActionBar;
 import android.app.Activity;
diff --git a/src/com/android/calendar/MonthFragment.java b/src/com/android/calendar/MonthFragment.java
index e44a0967..68135617 100644
--- a/src/com/android/calendar/MonthFragment.java
+++ b/src/com/android/calendar/MonthFragment.java
@@ -20,7 +20,7 @@ import static android.provider.Calendar.EVENT_BEGIN_TIME;
 
 import com.android.calendar.CalendarController.EventInfo;
 import com.android.calendar.CalendarController.EventType;
-import com.android.calendar.Month.MiniMonthView;
+import com.android.calendar.month.MiniMonthView;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/src/com/android/calendar/Month/MiniMonthView.java b/src/com/android/calendar/month/MiniMonthView.java
index 3c19bb6b..fa07a33d 100644
--- a/src/com/android/calendar/Month/MiniMonthView.java
+++ b/src/com/android/calendar/month/MiniMonthView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar.Month;
+package com.android.calendar.month;
 
 import com.android.calendar.CalendarController;
 import com.android.calendar.Event;
diff --git a/src/com/android/calendar/SelectCalendars/SelectCalendarsFragment.java b/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java
index ce169ae1..805a7f7c 100644
--- a/src/com/android/calendar/SelectCalendars/SelectCalendarsFragment.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar.SelectCalendars;
+package com.android.calendar.selectcalendars;
 
 import com.android.calendar.AsyncQueryService;
 import com.android.calendar.R;
diff --git a/src/com/android/calendar/SelectCalendars/SelectCalendarsSimpleAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
index b54155ae..2a4815c4 100644
--- a/src/com/android/calendar/SelectCalendars/SelectCalendarsSimpleAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar.SelectCalendars;
+package com.android.calendar.selectcalendars;
 
 import com.android.calendar.R;
 
diff --git a/src/com/android/calendar/CalendarAppWidgetModel.java b/src/com/android/calendar/widget/CalendarAppWidgetModel.java
index 5389fcb2..5b6bedde 100644
--- a/src/com/android/calendar/CalendarAppWidgetModel.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetModel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.widget;
 
 import android.view.View;
 
diff --git a/src/com/android/calendar/CalendarAppWidgetProvider.java b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java
index fcd7279e..048d627c 100644
--- a/src/com/android/calendar/CalendarAppWidgetProvider.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.widget;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
diff --git a/src/com/android/calendar/CalendarAppWidgetReceiver.java b/src/com/android/calendar/widget/CalendarAppWidgetReceiver.java
index ecab6e2c..13edcb3d 100644
--- a/src/com/android/calendar/CalendarAppWidgetReceiver.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.widget;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/calendar/CalendarAppWidgetService.java b/src/com/android/calendar/widget/CalendarAppWidgetService.java
index f1debef0..f3f91639 100644
--- a/src/com/android/calendar/CalendarAppWidgetService.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetService.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.widget;
 
 import com.google.common.annotations.VisibleForTesting;
 
-import com.android.calendar.CalendarAppWidgetModel.EventInfo;
+import com.android.calendar.R;
+import com.android.calendar.Utils;
+import com.android.calendar.widget.CalendarAppWidgetModel.EventInfo;
 
 
 import android.app.AlarmManager;
diff --git a/tests/src/com/android/calendar/CalendarAppWidgetServiceTest.java b/tests/src/com/android/calendar/widget/CalendarAppWidgetServiceTest.java
index 1a810497..7bf53eca 100644
--- a/tests/src/com/android/calendar/CalendarAppWidgetServiceTest.java
+++ b/tests/src/com/android/calendar/widget/CalendarAppWidgetServiceTest.java
@@ -15,9 +15,11 @@
 ** limitations under the License.
 */
 
-package com.android.calendar;
+package com.android.calendar.widget;
 
-import com.android.calendar.CalendarAppWidgetService.MarkedEvents;
+import com.android.calendar.widget.CalendarAppWidgetModel;
+import com.android.calendar.widget.CalendarAppWidgetService;
+import com.android.calendar.widget.CalendarAppWidgetService.MarkedEvents;
 
 import android.database.MatrixCursor;
 import android.test.AndroidTestCase;