diff --git a/Android.mk b/Android.mk
index 1fd0799b6..357d17e35 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,8 +19,8 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \
-    src/com/android/exchange/IEmailService.aidl \
-    src/com/android/exchange/IEmailServiceCallback.aidl
+    src/com/android/email/service/IEmailService.aidl \
+    src/com/android/email/service/IEmailServiceCallback.aidl
 
 
 LOCAL_PACKAGE_NAME := Email
diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index 1180912bd..9fcdd80a9 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -28,9 +28,9 @@ import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.MessageColumns;
 import com.android.email.service.EmailServiceProxy;
-import com.android.exchange.EmailServiceStatus;
-import com.android.exchange.IEmailService;
-import com.android.exchange.IEmailServiceCallback;
+import com.android.email.service.EmailServiceStatus;
+import com.android.email.service.IEmailService;
+import com.android.email.service.IEmailServiceCallback;
 import com.android.exchange.SyncManager;
 
 import android.content.ContentResolver;
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 9a4e25bf7..757ba5dc6 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -31,7 +31,7 @@ import com.android.email.provider.EmailContent.Attachment;
 import com.android.email.provider.EmailContent.Body;
 import com.android.email.provider.EmailContent.BodyColumns;
 import com.android.email.provider.EmailContent.Message;
-import com.android.exchange.EmailServiceConstants;
+import com.android.email.service.EmailServiceConstants;
 
 import org.apache.commons.io.IOUtils;
 
diff --git a/src/com/android/exchange/EmailServiceConstants.java b/src/com/android/email/service/EmailServiceConstants.java
similarity index 95%
rename from src/com/android/exchange/EmailServiceConstants.java
rename to src/com/android/email/service/EmailServiceConstants.java
index 80d310faa..8a5238f28 100644
--- a/src/com/android/exchange/EmailServiceConstants.java
+++ b/src/com/android/email/service/EmailServiceConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
+package com.android.email.service;
 
 public class EmailServiceConstants {
     public static final int MEETING_REQUEST_ACCEPTED = 1;
diff --git a/src/com/android/email/service/EmailServiceProxy.java b/src/com/android/email/service/EmailServiceProxy.java
index d5174fdac..98186cfd3 100644
--- a/src/com/android/email/service/EmailServiceProxy.java
+++ b/src/com/android/email/service/EmailServiceProxy.java
@@ -17,8 +17,6 @@
 package com.android.email.service;
 
 import com.android.email.mail.MessagingException;
-import com.android.exchange.IEmailService;
-import com.android.exchange.IEmailServiceCallback;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/src/com/android/exchange/EmailServiceStatus.java b/src/com/android/email/service/EmailServiceStatus.java
similarity index 97%
rename from src/com/android/exchange/EmailServiceStatus.java
rename to src/com/android/email/service/EmailServiceStatus.java
index 697548cf2..adfda254c 100644
--- a/src/com/android/exchange/EmailServiceStatus.java
+++ b/src/com/android/email/service/EmailServiceStatus.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
+package com.android.email.service;
 
 /**
  * Definitions of service status codes returned to IEmailServiceCallback's status method
diff --git a/src/com/android/exchange/IEmailService.aidl b/src/com/android/email/service/IEmailService.aidl
similarity index 92%
rename from src/com/android/exchange/IEmailService.aidl
rename to src/com/android/email/service/IEmailService.aidl
index a790645d2..545783b13 100644
--- a/src/com/android/exchange/IEmailService.aidl
+++ b/src/com/android/email/service/IEmailService.aidl
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.exchange;
+package com.android.email.service;
 
-import com.android.exchange.IEmailServiceCallback;
-import com.android.email.provider.EmailContent;
+import com.android.email.service.IEmailServiceCallback;
 import android.os.Bundle;
 
 interface IEmailService {
diff --git a/src/com/android/exchange/IEmailServiceCallback.aidl b/src/com/android/email/service/IEmailServiceCallback.aidl
similarity index 98%
rename from src/com/android/exchange/IEmailServiceCallback.aidl
rename to src/com/android/email/service/IEmailServiceCallback.aidl
index a789c4a02..ac2cb419e 100644
--- a/src/com/android/exchange/IEmailServiceCallback.aidl
+++ b/src/com/android/email/service/IEmailServiceCallback.aidl
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
+package com.android.email.service;
 
 oneway interface IEmailServiceCallback {
     /*
diff --git a/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java
index 38c96030e..d827d51b7 100644
--- a/src/com/android/exchange/EasOutboxService.java
+++ b/src/com/android/exchange/EasOutboxService.java
@@ -26,6 +26,7 @@ import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.MessageColumns;
 import com.android.email.provider.EmailContent.SyncColumns;
+import com.android.email.service.EmailServiceStatus;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 63f1587f9..544a82fa5 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -29,6 +29,7 @@ import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.service.EmailServiceProxy;
+import com.android.email.service.EmailServiceStatus;
 import com.android.exchange.adapter.AbstractSyncAdapter;
 import com.android.exchange.adapter.AccountSyncAdapter;
 import com.android.exchange.adapter.CalendarSyncAdapter;
diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 648fc8006..5ed0047ad 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -29,6 +29,8 @@ import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.SyncColumns;
+import com.android.email.service.IEmailService;
+import com.android.email.service.IEmailServiceCallback;
 import com.android.exchange.utility.FileLogger;
 
 import org.apache.http.conn.ClientConnectionManager;