From 6a2ab4008cf19f1ecd943b12dca7b7835396f77d Mon Sep 17 00:00:00 2001
From: Matthew Brace <ismarc31@gmail.com>
Date: Wed, 18 Mar 2009 00:44:21 +0000
Subject: [PATCH] Restructure the organization of WBXML classes and code pages.

---
 .../email/mail/internet/protocol/ActiveSyncProtocol.java    | 6 ++++--
 .../android/email/mail/internet/{ => wbxml}/CodePage.java   | 2 +-
 src/com/android/email/mail/internet/{ => wbxml}/WBXML.java  | 4 ++--
 .../internet/{ => wbxml/activesync}/AirNotifyCodePage.java  | 4 ++--
 .../{ => wbxml/activesync}/AirSyncBaseCodePage.java         | 4 ++--
 .../internet/{ => wbxml/activesync}/AirSyncCodePage.java    | 4 ++--
 .../internet/{ => wbxml/activesync}/CalendarCodePage.java   | 4 ++--
 .../internet/{ => wbxml/activesync}/Contacts2CodePage.java  | 4 ++--
 .../internet/{ => wbxml/activesync}/ContactsCodePage.java   | 4 ++--
 .../{ => wbxml/activesync}/DocumentLibraryCodePage.java     | 4 ++--
 .../mail/internet/{ => wbxml/activesync}/EmailCodePage.java | 4 ++--
 .../{ => wbxml/activesync}/FolderHierarchyCodePage.java     | 4 ++--
 .../mail/internet/{ => wbxml/activesync}/GALCodePage.java   | 4 ++--
 .../{ => wbxml/activesync}/ItemEstimateCodePage.java        | 4 ++--
 .../{ => wbxml/activesync}/ItemOperationsCodePage.java      | 4 ++--
 .../{ => wbxml/activesync}/MeetingResponseCodePage.java     | 4 ++--
 .../mail/internet/{ => wbxml/activesync}/MoveCodePage.java  | 4 ++--
 .../mail/internet/{ => wbxml/activesync}/PingCodePage.java  | 4 ++--
 .../internet/{ => wbxml/activesync}/ProvisionCodePage.java  | 4 ++--
 .../{ => wbxml/activesync}/ResolveRecipientsCodePage.java   | 4 ++--
 .../internet/{ => wbxml/activesync}/SearchCodePage.java     | 4 ++--
 .../internet/{ => wbxml/activesync}/SettingsCodePage.java   | 4 ++--
 .../mail/internet/{ => wbxml/activesync}/TasksCodePage.java | 4 ++--
 .../{ => wbxml/activesync}/ValidateCertCodePage.java        | 4 ++--
 24 files changed, 49 insertions(+), 47 deletions(-)
 rename src/com/android/email/mail/internet/{ => wbxml}/CodePage.java (99%)
 mode change 100644 => 100755
 rename src/com/android/email/mail/internet/{ => wbxml}/WBXML.java (99%)
 mode change 100644 => 100755
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/AirNotifyCodePage.java (93%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/AirSyncBaseCodePage.java (93%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/AirSyncCodePage.java (97%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/CalendarCodePage.java (95%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/Contacts2CodePage.java (91%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/ContactsCodePage.java (98%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/DocumentLibraryCodePage.java (90%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/EmailCodePage.java (96%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/FolderHierarchyCodePage.java (93%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/GALCodePage.java (90%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/ItemEstimateCodePage.java (91%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/ItemOperationsCodePage.java (92%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/MeetingResponseCodePage.java (90%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/MoveCodePage.java (89%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/PingCodePage.java (90%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/ProvisionCodePage.java (97%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/ResolveRecipientsCodePage.java (93%)
 mode change 100755 => 100644
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/SearchCodePage.java (94%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/SettingsCodePage.java (94%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/TasksCodePage.java (95%)
 rename src/com/android/email/mail/internet/{ => wbxml/activesync}/ValidateCertCodePage.java (89%)

diff --git a/src/com/android/email/mail/internet/protocol/ActiveSyncProtocol.java b/src/com/android/email/mail/internet/protocol/ActiveSyncProtocol.java
index 0a3da26d0..b92fbb91f 100755
--- a/src/com/android/email/mail/internet/protocol/ActiveSyncProtocol.java
+++ b/src/com/android/email/mail/internet/protocol/ActiveSyncProtocol.java
@@ -7,8 +7,10 @@ import com.android.email.Utility;
 import com.android.email.mail.Folder;
 import com.android.email.mail.ProtocolException;
 import com.android.email.mail.Store;
-import com.android.email.mail.internet.*;
-import com.android.email.mail.internet.WBXML;
+import com.android.email.mail.internet.HttpGeneric;
+import com.android.email.mail.internet.wbxml.activesync.*;
+import com.android.email.mail.internet.wbxml.WBXML;
+import com.android.email.mail.internet.wbxml.CodePage;
 import com.android.email.mail.internet.protocol.Protocol;
 import com.android.email.mail.store.ActiveSyncStore;
 import com.android.email.mail.transport.TrustedSocketFactory;
diff --git a/src/com/android/email/mail/internet/CodePage.java b/src/com/android/email/mail/internet/wbxml/CodePage.java
old mode 100644
new mode 100755
similarity index 99%
rename from src/com/android/email/mail/internet/CodePage.java
rename to src/com/android/email/mail/internet/wbxml/CodePage.java
index 7c4b3d215..5f573658f
--- a/src/com/android/email/mail/internet/CodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/CodePage.java
@@ -1,4 +1,4 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml;
 
 import java.util.HashMap;
 
diff --git a/src/com/android/email/mail/internet/WBXML.java b/src/com/android/email/mail/internet/wbxml/WBXML.java
old mode 100644
new mode 100755
similarity index 99%
rename from src/com/android/email/mail/internet/WBXML.java
rename to src/com/android/email/mail/internet/wbxml/WBXML.java
index 0296fe623..9af03e545
--- a/src/com/android/email/mail/internet/WBXML.java
+++ b/src/com/android/email/mail/internet/wbxml/WBXML.java
@@ -1,4 +1,4 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedInputStream;
@@ -20,7 +20,7 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.android.email.Utility;
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class represents an entity for converting between WBXML and XML. The process uses
diff --git a/src/com/android/email/mail/internet/AirNotifyCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/AirNotifyCodePage.java
similarity index 93%
rename from src/com/android/email/mail/internet/AirNotifyCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/AirNotifyCodePage.java
index 38b623dbd..7b92e170a 100644
--- a/src/com/android/email/mail/internet/AirNotifyCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/AirNotifyCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for AirNotify in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/AirSyncBaseCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/AirSyncBaseCodePage.java
similarity index 93%
rename from src/com/android/email/mail/internet/AirSyncBaseCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/AirSyncBaseCodePage.java
index 86d846c05..eaf6a548e 100644
--- a/src/com/android/email/mail/internet/AirSyncBaseCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/AirSyncBaseCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for AirSyncBase in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/AirSyncCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/AirSyncCodePage.java
similarity index 97%
rename from src/com/android/email/mail/internet/AirSyncCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/AirSyncCodePage.java
index bdb86afab..be16ad0b0 100644
--- a/src/com/android/email/mail/internet/AirSyncCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/AirSyncCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for AirSync in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/CalendarCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/CalendarCodePage.java
similarity index 95%
rename from src/com/android/email/mail/internet/CalendarCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/CalendarCodePage.java
index 033f0679b..a0230012d 100644
--- a/src/com/android/email/mail/internet/CalendarCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/CalendarCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Calendar in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/Contacts2CodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/Contacts2CodePage.java
similarity index 91%
rename from src/com/android/email/mail/internet/Contacts2CodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/Contacts2CodePage.java
index 0d4b0daf0..d0e0d76ae 100644
--- a/src/com/android/email/mail/internet/Contacts2CodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/Contacts2CodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Contacts2 in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/ContactsCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/ContactsCodePage.java
similarity index 98%
rename from src/com/android/email/mail/internet/ContactsCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/ContactsCodePage.java
index 5d0fb6d53..858131120 100644
--- a/src/com/android/email/mail/internet/ContactsCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/ContactsCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Contacts in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/DocumentLibraryCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/DocumentLibraryCodePage.java
similarity index 90%
rename from src/com/android/email/mail/internet/DocumentLibraryCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/DocumentLibraryCodePage.java
index cc860d575..c18f398c7 100644
--- a/src/com/android/email/mail/internet/DocumentLibraryCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/DocumentLibraryCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for DocumentLibrary in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/EmailCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/EmailCodePage.java
similarity index 96%
rename from src/com/android/email/mail/internet/EmailCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/EmailCodePage.java
index 0c73aae30..d9fd67239 100644
--- a/src/com/android/email/mail/internet/EmailCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/EmailCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Emails in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/FolderHierarchyCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/FolderHierarchyCodePage.java
similarity index 93%
rename from src/com/android/email/mail/internet/FolderHierarchyCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/FolderHierarchyCodePage.java
index b16bae988..2c5501dfc 100644
--- a/src/com/android/email/mail/internet/FolderHierarchyCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/FolderHierarchyCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for FolderHierarchy in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/GALCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/GALCodePage.java
similarity index 90%
rename from src/com/android/email/mail/internet/GALCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/GALCodePage.java
index 748fe40ff..d5e8f24ff 100644
--- a/src/com/android/email/mail/internet/GALCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/GALCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for GAL in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/ItemEstimateCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/ItemEstimateCodePage.java
similarity index 91%
rename from src/com/android/email/mail/internet/ItemEstimateCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/ItemEstimateCodePage.java
index c140894db..c8b1bde21 100644
--- a/src/com/android/email/mail/internet/ItemEstimateCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/ItemEstimateCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ItemEstimate in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/ItemOperationsCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/ItemOperationsCodePage.java
similarity index 92%
rename from src/com/android/email/mail/internet/ItemOperationsCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/ItemOperationsCodePage.java
index ea87c7520..a5401acd2 100644
--- a/src/com/android/email/mail/internet/ItemOperationsCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/ItemOperationsCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ItemOperations in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/MeetingResponseCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/MeetingResponseCodePage.java
similarity index 90%
rename from src/com/android/email/mail/internet/MeetingResponseCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/MeetingResponseCodePage.java
index 79b98b03a..017e4b567 100644
--- a/src/com/android/email/mail/internet/MeetingResponseCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/MeetingResponseCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for MeetingResponse in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/MoveCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/MoveCodePage.java
similarity index 89%
rename from src/com/android/email/mail/internet/MoveCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/MoveCodePage.java
index 9e88148f0..e5d92843a 100644
--- a/src/com/android/email/mail/internet/MoveCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/MoveCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Move in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/PingCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/PingCodePage.java
similarity index 90%
rename from src/com/android/email/mail/internet/PingCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/PingCodePage.java
index 497d9c644..a8011b868 100644
--- a/src/com/android/email/mail/internet/PingCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/PingCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Ping in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/ProvisionCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/ProvisionCodePage.java
similarity index 97%
rename from src/com/android/email/mail/internet/ProvisionCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/ProvisionCodePage.java
index cc975b015..e95418e69 100644
--- a/src/com/android/email/mail/internet/ProvisionCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/ProvisionCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Provision in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/ResolveRecipientsCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/ResolveRecipientsCodePage.java
old mode 100755
new mode 100644
similarity index 93%
rename from src/com/android/email/mail/internet/ResolveRecipientsCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/ResolveRecipientsCodePage.java
index 4926bf4dd..11eed0eb3
--- a/src/com/android/email/mail/internet/ResolveRecipientsCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/ResolveRecipientsCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ResolveRecipients in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/SearchCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/SearchCodePage.java
similarity index 94%
rename from src/com/android/email/mail/internet/SearchCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/SearchCodePage.java
index 466da6a2d..6875af31a 100644
--- a/src/com/android/email/mail/internet/SearchCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/SearchCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Search in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/SettingsCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/SettingsCodePage.java
similarity index 94%
rename from src/com/android/email/mail/internet/SettingsCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/SettingsCodePage.java
index 1f36d00cf..de3b04843 100644
--- a/src/com/android/email/mail/internet/SettingsCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/SettingsCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Settings in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/TasksCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/TasksCodePage.java
similarity index 95%
rename from src/com/android/email/mail/internet/TasksCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/TasksCodePage.java
index e90410e74..3d5f60fd2 100644
--- a/src/com/android/email/mail/internet/TasksCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/TasksCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Tasks in the ActiveSync protocol.
diff --git a/src/com/android/email/mail/internet/ValidateCertCodePage.java b/src/com/android/email/mail/internet/wbxml/activesync/ValidateCertCodePage.java
similarity index 89%
rename from src/com/android/email/mail/internet/ValidateCertCodePage.java
rename to src/com/android/email/mail/internet/wbxml/activesync/ValidateCertCodePage.java
index 8d462a533..7adeff15a 100644
--- a/src/com/android/email/mail/internet/ValidateCertCodePage.java
+++ b/src/com/android/email/mail/internet/wbxml/activesync/ValidateCertCodePage.java
@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ValidateCert in the ActiveSync protocol.