diff --git a/.idea/scopes/Astrid.xml b/.idea/scopes/Astrid.xml
index d6058e323..ed8e2ee3e 100644
--- a/.idea/scopes/Astrid.xml
+++ b/.idea/scopes/Astrid.xml
@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="Astrid" pattern="src:*..*&amp;&amp;!src[ActionBarSherlock]:*..*&amp;&amp;!src[android-aac-enc]:*..*&amp;&amp;!src[GreenDroid]:*..*&amp;&amp;!src[ViewPagerIndicator]:*..*&amp;&amp;!src[tests]:*..*&amp;&amp;!src[tests-sync]:*..*" />
+  <scope name="Astrid" pattern="(src:*..*&amp;&amp;!src[ActionBarSherlock]:*..*&amp;&amp;!src[android-aac-enc]:*..*&amp;&amp;!src[GreenDroid]:*..*&amp;&amp;!src[ViewPagerIndicator]:*..*&amp;&amp;!src[tests]:*..*&amp;&amp;!src[tests-sync]:*..*&amp;&amp;!src[astrid]:com.commonsware.cwac.tlv..*&amp;&amp;!src[astrid]:com.mdimension.jchronic..*||file[astrid]:src/com/mdimension/jchronic//*)&amp;&amp;!file[astrid]:src/edu/mit/mobile/android/imagecache//*" />
 </component>
\ No newline at end of file
diff --git a/api/src/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/com/todoroo/astrid/api/AstridApiConstants.java
index fec381065..3ef69e11b 100644
--- a/api/src/com/todoroo/astrid/api/AstridApiConstants.java
+++ b/api/src/com/todoroo/astrid/api/AstridApiConstants.java
@@ -21,7 +21,7 @@ public class AstridApiConstants {
     /**
      * Astrid broadcast base package name
      */
-    public static final String API_PACKAGE = "com.todoroo.astrid";
+    public static final String API_PACKAGE = "org.astrid";
 
     /**
      * Astrid app base package name
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 10d239a3c..476464667 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -45,28 +45,28 @@
 
     <!-- for v2 tasks provider -->
     <permission
-            android:name="com.timsu.astrid.permission.READ_TASKS"
+            android:name="org.astrid.permission.READ_TASKS"
             android:permissionGroup="android.permission-group.MESSAGES"
             android:protectionLevel="normal"
             android:label="@string/read_permission_label"
             android:description="@string/read_permission_desc"/>
-    <uses-permission android:name="com.timsu.astrid.permission.READ_TASKS"/>
+    <uses-permission android:name="org.astrid.permission.READ_TASKS"/>
 
     <!-- for reading data from add-ons or astrid via v3 content provider -->
     <permission
-            android:name="com.todoroo.astrid.READ"
+            android:name="org.astrid.READ"
             android:description="@string/read_permission_desc"
             android:protectionLevel="normal"
             android:label="@string/read_permission_label"/>
-    <uses-permission android:name="com.todoroo.astrid.READ"/>
+    <uses-permission android:name="org.astrid.READ"/>
 
     <!-- for writing data to add-ons or astrid via v3 content provider -->
     <permission
-            android:name="com.todoroo.astrid.WRITE"
+            android:name="org.astrid.WRITE"
             android:description="@string/write_permission_desc"
             android:protectionLevel="normal"
             android:label="@string/write_permission_label"/>
-    <uses-permission android:name="com.todoroo.astrid.WRITE"/>
+    <uses-permission android:name="org.astrid.WRITE"/>
 
     <!-- ========================================================== Metadata = -->
 
@@ -187,7 +187,7 @@
 
         <receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver">
             <intent-filter>
-                <action android:name="com.timsu.astrid.IN_APP_NOTIFY"/>
+                <action android:name="org.astrid.IN_APP_NOTIFY"/>
             </intent-filter>
         </receiver>
 
@@ -205,7 +205,7 @@
 
         <receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.FLUSH_DETAILS"/>
+                <action android:name="org.astrid.FLUSH_DETAILS"/>
             </intent-filter>
         </receiver>
 
@@ -217,7 +217,7 @@
 
         <receiver android:name="com.todoroo.astrid.reminders.ReengagementReceiver">
             <intent-filter>
-                <action android:name="com.timsu.astrid.SHOW_REENGAGEMENT"/>
+                <action android:name="org.astrid.SHOW_REENGAGEMENT"/>
             </intent-filter>
         </receiver>
 
@@ -229,39 +229,39 @@
 
         <provider
                 android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
-                android:authorities="com.timsu.astrid.tasksprovider"
+                android:authorities="org.astrid.tasksprovider"
                 android:multiprocess="true"
                 android:grantUriPermissions="true"
-                android:readPermission="com.timsu.astrid.permission.READ_TASKS"/>
+                android:readPermission="org.astrid.permission.READ_TASKS"/>
 
         <provider
                 android:name="com.todoroo.astrid.provider.Astrid3ContentProvider"
-                android:authorities="com.todoroo.astrid"
+                android:authorities="org.astrid"
                 android:multiprocess="true"
                 android:grantUriPermissions="true"
-                android:readPermission="com.todoroo.astrid.READ"
-                android:writePermission="com.todoroo.astrid.WRITE"/>
+                android:readPermission="org.astrid.READ"
+                android:writePermission="org.astrid.WRITE"/>
 
         <provider
                 android:name="com.todoroo.astrid.provider.SqlContentProvider"
-                android:authorities="com.todoroo.astrid.private"
+                android:authorities="org.astrid.private"
                 android:multiprocess="true"
                 android:grantUriPermissions="true"
-                android:readPermission="com.todoroo.astrid.READ"
-                android:writePermission="com.todoroo.astrid.WRITE"/>
+                android:readPermission="org.astrid.READ"
+                android:writePermission="org.astrid.WRITE"/>
 
         <!-- ========================================================= Plugins = -->
 
         <!-- core -->
         <receiver android:name="com.todoroo.astrid.core.CorePlugin">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_ADDONS"/>
+                <action android:name="org.astrid.REQUEST_ADDONS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.core.CoreFilterExposer">
             <intent-filter android:priority="9000">
-                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <action android:name="org.astrid.REQUEST_FILTERS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -274,7 +274,7 @@
                     android:name="summary"
                     android:resource="@string/EPr_defaults_summary"/>
             <intent-filter>
-                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <action android:name="org.astrid.SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
@@ -291,25 +291,25 @@
         <!-- tags -->
         <receiver android:name="com.todoroo.astrid.tags.TagsPlugin">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_ADDONS"/>
+                <action android:name="org.astrid.REQUEST_ADDONS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.tags.TagFilterExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <action android:name="org.astrid.REQUEST_FILTERS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA"/>
+                <action android:name="org.astrid.REQUEST_CUSTOM_FILTER_CRITERIA"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.tags.TagDetailExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <action android:name="org.astrid.REQUEST_DETAILS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -317,7 +317,7 @@
         <!-- custom filters -->
         <receiver android:name="com.todoroo.astrid.core.CustomFilterExposer">
             <intent-filter android:priority="9000">
-                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <action android:name="org.astrid.REQUEST_FILTERS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -338,20 +338,20 @@
         <!-- Featured lists -->
         <receiver android:name="com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer">
             <intent-filter>
-                <action android:name="com.timsu.astrid.REQUEST_FEATURED_LISTS"/>
+                <action android:name="org.astrid.REQUEST_FEATURED_LISTS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <!-- alarms -->
         <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.TASK_REPEATED"/>
+                <action android:name="org.astrid.TASK_REPEATED"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.alarms.AlarmDetailExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <action android:name="org.astrid.REQUEST_DETAILS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -364,7 +364,7 @@
 
         <service android:name="com.todoroo.astrid.actfm.ActFmBackgroundService">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.actfm.SYNC"/>
+                <action android:name="org.astrid.actfm.SYNC"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </service>
@@ -403,13 +403,13 @@
 
         <receiver android:name="com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA"/>
+                <action android:name="org.astrid.REQUEST_CUSTOM_FILTER_CRITERIA"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <action android:name="org.astrid.REQUEST_FILTERS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -419,7 +419,7 @@
                 android:theme="@android:style/Theme.Dialog"/>
         <receiver android:name="com.todoroo.astrid.gtasks.GtasksDetailExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <action android:name="org.astrid.REQUEST_DETAILS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -436,13 +436,13 @@
                     android:value="true"/>
 
             <intent-filter>
-                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <action android:name="org.astrid.SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <service android:name="com.todoroo.astrid.gtasks.GtasksBackgroundService">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.gtasks.SYNC"/>
+                <action android:name="org.astrid.gtasks.SYNC"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </service>
@@ -456,19 +456,19 @@
         <!-- repeats -->
         <receiver android:name="com.todoroo.astrid.repeats.RepeatsPlugin">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_ADDONS"/>
+                <action android:name="org.astrid.REQUEST_ADDONS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.repeats.RepeatTaskCompleteListener">
             <intent-filter android:priority="1">
-                <action android:name="com.todoroo.astrid.TASK_COMPLETED"/>
+                <action android:name="org.astrid.TASK_COMPLETED"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.repeats.RepeatDetailExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <action android:name="org.astrid.REQUEST_DETAILS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -476,7 +476,7 @@
         <!-- calendar -->
         <receiver android:name="com.todoroo.astrid.gcal.GCalTaskCompleteListener">
             <intent-filter android:priority="2">
-                <action android:name="com.todoroo.astrid.TASK_COMPLETED"/>
+                <action android:name="org.astrid.TASK_COMPLETED"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -487,7 +487,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.todoroo.astrid.SCHEDULE_CAL_REMINDERS"/>
+                <action android:name="org.astrid.SCHEDULE_CAL_REMINDERS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -513,7 +513,7 @@
                     android:name="category"
                     android:resource="@string/SyP_label"/>
             <intent-filter>
-                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <action android:name="org.astrid.SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
@@ -532,7 +532,7 @@
                     android:name="category"
                     android:resource="@string/SyP_label"/>
             <intent-filter>
-                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <action android:name="org.astrid.SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
@@ -571,20 +571,20 @@
         <!-- notes -->
         <receiver android:name="com.todoroo.astrid.notes.NotesDetailExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <action android:name="org.astrid.REQUEST_DETAILS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
             <intent-filter android:priority="10000">
-                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <action android:name="org.astrid.REQUEST_FILTERS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.TASK_COMPLETED"/>
+                <action android:name="org.astrid.TASK_COMPLETED"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
@@ -598,7 +598,7 @@
                     android:name="summary"
                     android:resource="@string/rmd_EPr_alerts_summary"/>
             <intent-filter>
-                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <action android:name="org.astrid.SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
@@ -613,7 +613,7 @@
         <!-- other task actions -->
         <receiver android:name="com.todoroo.astrid.core.LinkActionExposer">
             <intent-filter>
-                <action android:name="com.todoroo.astrid.REQUEST_ACTIONS"/>
+                <action android:name="org.astrid.REQUEST_ACTIONS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
index e6f103fc4..924e19c09 100644
--- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
@@ -53,9 +53,9 @@ public class Astrid2TaskProvider extends ContentProvider {
 
     private static final boolean LOGD = false;
 
-    public static final String AUTHORITY = "com.timsu.astrid.tasksprovider";
+    public static final String AUTHORITY = "org.astrid.tasksprovider";
 
-    public static final Uri CONTENT_URI = Uri.parse("content://com.timsu.astrid.tasksprovider");
+    public static final Uri CONTENT_URI = Uri.parse("content://org.astrid.tasksprovider");
 
     private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
 
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
deleted file mode 100644
index ee97a08b7..000000000
--- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.ui;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.astrid.data.TagData;
-import com.todoroo.astrid.service.TagDataService;
-
-import org.astrid.R;
-
-import java.io.InputStream;
-
-
-public class ContactListAdapter extends CursorAdapter {
-
-    @Autowired
-    TagDataService tagDataService;
-
-    private static final String[] PEOPLE_PROJECTION = new String[]{
-            Email._ID, Email.CONTACT_ID, ContactsContract.Contacts.DISPLAY_NAME, Email.DATA
-    };
-
-    public ContactListAdapter(Activity activity, Cursor c) {
-        super(activity, c);
-        mContent = activity.getContentResolver();
-        DependencyInjectionService.getInstance().inject(this);
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        final LayoutInflater inflater = LayoutInflater.from(context);
-        final View view = inflater.inflate(R.layout.contact_adapter_row, parent, false);
-        bindView(view, context, cursor);
-        return view;
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        TextView text1 = (TextView) view.findViewById(android.R.id.text1);
-        TextView text2 = (TextView) view.findViewById(android.R.id.text2);
-        ImageView imageView = (ImageView) view.findViewById(R.id.icon);
-
-        if (cursor.getColumnNames().length == PEOPLE_PROJECTION.length) {
-            int name = cursor.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME);
-            int email = cursor.getColumnIndexOrThrow(Email.DATA);
-            if (cursor.isNull(name)) {
-                text1.setText(cursor.getString(email));
-                text2.setText("");
-            } else {
-                text1.setText(cursor.getString(name));
-                text2.setText(cursor.getString(email));
-            }
-            imageView.setImageResource(R.drawable.icn_default_person_image);
-            Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, cursor.getLong(0));
-            imageView.setTag(uri);
-            ContactImageTask ciTask = new ContactImageTask(imageView);
-            ciTask.execute(uri);
-        } else {
-            int name = cursor.getColumnIndexOrThrow(TagData.NAME.name);
-            text1.setText(cursor.getString(name));
-            imageView.setImageResource(R.drawable.med_tag);
-        }
-    }
-
-    private class ContactImageTask extends AsyncTask<Uri, Void, Bitmap> {
-        private Uri uri;
-        private final ImageView imageView;
-
-
-        public ContactImageTask(ImageView imageView) {
-            this.imageView = imageView;
-        }
-
-        @Override
-        protected Bitmap doInBackground(Uri... params) {
-            uri = params[0];
-            InputStream input = ContactsContract.Contacts.openContactPhotoInputStream(mContent, uri);
-            if (input == null) {
-                return null;
-            }
-            return BitmapFactory.decodeStream(input);
-        }
-
-        @Override
-        protected void onPostExecute(Bitmap bitmap) {
-            if (isCancelled()) {
-                bitmap = null;
-            }
-            if (imageView != null && uri.equals(imageView.getTag()) && bitmap != null) {
-                imageView.setImageBitmap(bitmap);
-            }
-        }
-    }
-
-    @Override
-    public String convertToString(Cursor cursor) {
-        if (cursor.getColumnIndex(Email.DATA) > -1) {
-            int name = cursor.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME);
-            int email = cursor.getColumnIndexOrThrow(Email.DATA);
-            if (cursor.isNull(name)) {
-                return cursor.getString(email);
-            }
-            return cursor.getString(name) + " <" + cursor.getString(email) + ">";
-        } else {
-            int name = cursor.getColumnIndexOrThrow(TagData.NAME.name);
-            return "#" + cursor.getString(name);
-        }
-    }
-
-    @Override
-    public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
-        if (getFilterQueryProvider() != null) {
-            return getFilterQueryProvider().runQuery(constraint);
-        }
-
-        String filterParams = constraint == null ? "" : Uri.encode(constraint.toString());
-        Uri uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, filterParams);
-        String sort = Email.TIMES_CONTACTED + " DESC LIMIT 20";
-
-        return mContent.query(uri, PEOPLE_PROJECTION, null, null, sort);
-    }
-
-    private final ContentResolver mContent;
-}
diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java
index a379090ab..80af90464 100644
--- a/astrid/src/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/com/todoroo/astrid/utility/Constants.java
@@ -15,7 +15,7 @@ public final class Constants {
     /**
      * Application Package
      */
-    public static final String PACKAGE = "com.timsu.astrid";
+    public static final String PACKAGE = "org.astrid";
 
     /**
      * Whether this is an OEM installation