diff --git a/src/com/android/k9/Account.java b/src/com/android/android/Account.java
similarity index 100%
rename from src/com/android/k9/Account.java
rename to src/com/android/android/Account.java
diff --git a/src/com/android/k9/EmailAddressAdapter.java b/src/com/android/android/EmailAddressAdapter.java
similarity index 100%
rename from src/com/android/k9/EmailAddressAdapter.java
rename to src/com/android/android/EmailAddressAdapter.java
diff --git a/src/com/android/k9/EmailAddressValidator.java b/src/com/android/android/EmailAddressValidator.java
similarity index 100%
rename from src/com/android/k9/EmailAddressValidator.java
rename to src/com/android/android/EmailAddressValidator.java
diff --git a/src/com/android/k9/FixedLengthInputStream.java b/src/com/android/android/FixedLengthInputStream.java
similarity index 100%
rename from src/com/android/k9/FixedLengthInputStream.java
rename to src/com/android/android/FixedLengthInputStream.java
diff --git a/src/com/android/k9/Manifest.java b/src/com/android/android/Manifest.java
similarity index 100%
rename from src/com/android/k9/Manifest.java
rename to src/com/android/android/Manifest.java
diff --git a/src/com/android/k9/MessagingController.java b/src/com/android/android/MessagingController.java
similarity index 100%
rename from src/com/android/k9/MessagingController.java
rename to src/com/android/android/MessagingController.java
diff --git a/src/com/android/k9/MessagingListener.java b/src/com/android/android/MessagingListener.java
similarity index 100%
rename from src/com/android/k9/MessagingListener.java
rename to src/com/android/android/MessagingListener.java
diff --git a/src/com/android/k9/PeekableInputStream.java b/src/com/android/android/PeekableInputStream.java
similarity index 100%
rename from src/com/android/k9/PeekableInputStream.java
rename to src/com/android/android/PeekableInputStream.java
diff --git a/src/com/android/k9/Preferences.java b/src/com/android/android/Preferences.java
similarity index 100%
rename from src/com/android/k9/Preferences.java
rename to src/com/android/android/Preferences.java
diff --git a/src/com/android/k9/Utility.java b/src/com/android/android/Utility.java
similarity index 100%
rename from src/com/android/k9/Utility.java
rename to src/com/android/android/Utility.java
diff --git a/src/com/android/k9/activity/Accounts.java b/src/com/android/android/activity/Accounts.java
similarity index 100%
rename from src/com/android/k9/activity/Accounts.java
rename to src/com/android/android/activity/Accounts.java
diff --git a/src/com/android/k9/activity/Debug.java b/src/com/android/android/activity/Debug.java
similarity index 100%
rename from src/com/android/k9/activity/Debug.java
rename to src/com/android/android/activity/Debug.java
diff --git a/src/com/android/k9/activity/FolderMessageList.java b/src/com/android/android/activity/FolderMessageList.java
similarity index 100%
rename from src/com/android/k9/activity/FolderMessageList.java
rename to src/com/android/android/activity/FolderMessageList.java
diff --git a/src/com/android/k9/activity/MessageCompose.java b/src/com/android/android/activity/MessageCompose.java
similarity index 100%
rename from src/com/android/k9/activity/MessageCompose.java
rename to src/com/android/android/activity/MessageCompose.java
diff --git a/src/com/android/k9/activity/MessageView.java b/src/com/android/android/activity/MessageView.java
similarity index 100%
rename from src/com/android/k9/activity/MessageView.java
rename to src/com/android/android/activity/MessageView.java
diff --git a/src/com/android/k9/activity/ProgressListener.java b/src/com/android/android/activity/ProgressListener.java
similarity index 100%
rename from src/com/android/k9/activity/ProgressListener.java
rename to src/com/android/android/activity/ProgressListener.java
diff --git a/src/com/android/k9/activity/Welcome.java b/src/com/android/android/activity/Welcome.java
similarity index 100%
rename from src/com/android/k9/activity/Welcome.java
rename to src/com/android/android/activity/Welcome.java
diff --git a/src/com/android/k9/activity/setup/AccountSettings.java b/src/com/android/android/activity/setup/AccountSettings.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSettings.java
rename to src/com/android/android/activity/setup/AccountSettings.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupAccountType.java b/src/com/android/android/activity/setup/AccountSetupAccountType.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupAccountType.java
rename to src/com/android/android/activity/setup/AccountSetupAccountType.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupBasics.java b/src/com/android/android/activity/setup/AccountSetupBasics.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupBasics.java
rename to src/com/android/android/activity/setup/AccountSetupBasics.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/android/android/activity/setup/AccountSetupCheckSettings.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupCheckSettings.java
rename to src/com/android/android/activity/setup/AccountSetupCheckSettings.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupComposition.java b/src/com/android/android/activity/setup/AccountSetupComposition.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupComposition.java
rename to src/com/android/android/activity/setup/AccountSetupComposition.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupIncoming.java b/src/com/android/android/activity/setup/AccountSetupIncoming.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupIncoming.java
rename to src/com/android/android/activity/setup/AccountSetupIncoming.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupNames.java b/src/com/android/android/activity/setup/AccountSetupNames.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupNames.java
rename to src/com/android/android/activity/setup/AccountSetupNames.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupOptions.java b/src/com/android/android/activity/setup/AccountSetupOptions.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupOptions.java
rename to src/com/android/android/activity/setup/AccountSetupOptions.java
diff --git a/src/com/android/k9/activity/setup/AccountSetupOutgoing.java b/src/com/android/android/activity/setup/AccountSetupOutgoing.java
similarity index 100%
rename from src/com/android/k9/activity/setup/AccountSetupOutgoing.java
rename to src/com/android/android/activity/setup/AccountSetupOutgoing.java
diff --git a/src/com/android/k9/activity/setup/SpinnerOption.java b/src/com/android/android/activity/setup/SpinnerOption.java
similarity index 100%
rename from src/com/android/k9/activity/setup/SpinnerOption.java
rename to src/com/android/android/activity/setup/SpinnerOption.java
diff --git a/src/com/android/k9/codec/binary/Base64.java b/src/com/android/android/codec/binary/Base64.java
similarity index 100%
rename from src/com/android/k9/codec/binary/Base64.java
rename to src/com/android/android/codec/binary/Base64.java
diff --git a/src/com/android/k9/codec/binary/Base64OutputStream.java b/src/com/android/android/codec/binary/Base64OutputStream.java
similarity index 100%
rename from src/com/android/k9/codec/binary/Base64OutputStream.java
rename to src/com/android/android/codec/binary/Base64OutputStream.java
diff --git a/src/com/android/k9/k9.java b/src/com/android/android/k9.java
similarity index 100%
rename from src/com/android/k9/k9.java
rename to src/com/android/android/k9.java
diff --git a/src/com/android/k9/mail/Address.java b/src/com/android/android/mail/Address.java
similarity index 100%
rename from src/com/android/k9/mail/Address.java
rename to src/com/android/android/mail/Address.java
diff --git a/src/com/android/k9/mail/AuthenticationFailedException.java b/src/com/android/android/mail/AuthenticationFailedException.java
similarity index 100%
rename from src/com/android/k9/mail/AuthenticationFailedException.java
rename to src/com/android/android/mail/AuthenticationFailedException.java
diff --git a/src/com/android/k9/mail/Body.java b/src/com/android/android/mail/Body.java
similarity index 100%
rename from src/com/android/k9/mail/Body.java
rename to src/com/android/android/mail/Body.java
diff --git a/src/com/android/k9/mail/BodyPart.java b/src/com/android/android/mail/BodyPart.java
similarity index 100%
rename from src/com/android/k9/mail/BodyPart.java
rename to src/com/android/android/mail/BodyPart.java
diff --git a/src/com/android/k9/mail/CertificateValidationException.java b/src/com/android/android/mail/CertificateValidationException.java
similarity index 100%
rename from src/com/android/k9/mail/CertificateValidationException.java
rename to src/com/android/android/mail/CertificateValidationException.java
diff --git a/src/com/android/k9/mail/FetchProfile.java b/src/com/android/android/mail/FetchProfile.java
similarity index 100%
rename from src/com/android/k9/mail/FetchProfile.java
rename to src/com/android/android/mail/FetchProfile.java
diff --git a/src/com/android/k9/mail/Flag.java b/src/com/android/android/mail/Flag.java
similarity index 100%
rename from src/com/android/k9/mail/Flag.java
rename to src/com/android/android/mail/Flag.java
diff --git a/src/com/android/k9/mail/Folder.java b/src/com/android/android/mail/Folder.java
similarity index 100%
rename from src/com/android/k9/mail/Folder.java
rename to src/com/android/android/mail/Folder.java
diff --git a/src/com/android/k9/mail/Message.java b/src/com/android/android/mail/Message.java
similarity index 100%
rename from src/com/android/k9/mail/Message.java
rename to src/com/android/android/mail/Message.java
diff --git a/src/com/android/k9/mail/MessageDateComparator.java b/src/com/android/android/mail/MessageDateComparator.java
similarity index 100%
rename from src/com/android/k9/mail/MessageDateComparator.java
rename to src/com/android/android/mail/MessageDateComparator.java
diff --git a/src/com/android/k9/mail/MessageRetrievalListener.java b/src/com/android/android/mail/MessageRetrievalListener.java
similarity index 100%
rename from src/com/android/k9/mail/MessageRetrievalListener.java
rename to src/com/android/android/mail/MessageRetrievalListener.java
diff --git a/src/com/android/k9/mail/MessagingException.java b/src/com/android/android/mail/MessagingException.java
similarity index 100%
rename from src/com/android/k9/mail/MessagingException.java
rename to src/com/android/android/mail/MessagingException.java
diff --git a/src/com/android/k9/mail/Multipart.java b/src/com/android/android/mail/Multipart.java
similarity index 100%
rename from src/com/android/k9/mail/Multipart.java
rename to src/com/android/android/mail/Multipart.java
diff --git a/src/com/android/k9/mail/NoSuchProviderException.java b/src/com/android/android/mail/NoSuchProviderException.java
similarity index 100%
rename from src/com/android/k9/mail/NoSuchProviderException.java
rename to src/com/android/android/mail/NoSuchProviderException.java
diff --git a/src/com/android/k9/mail/Part.java b/src/com/android/android/mail/Part.java
similarity index 100%
rename from src/com/android/k9/mail/Part.java
rename to src/com/android/android/mail/Part.java
diff --git a/src/com/android/k9/mail/Store.java b/src/com/android/android/mail/Store.java
similarity index 100%
rename from src/com/android/k9/mail/Store.java
rename to src/com/android/android/mail/Store.java
diff --git a/src/com/android/k9/mail/Transport.java b/src/com/android/android/mail/Transport.java
similarity index 100%
rename from src/com/android/k9/mail/Transport.java
rename to src/com/android/android/mail/Transport.java
diff --git a/src/com/android/k9/mail/internet/BinaryTempFileBody.java b/src/com/android/android/mail/internet/BinaryTempFileBody.java
similarity index 100%
rename from src/com/android/k9/mail/internet/BinaryTempFileBody.java
rename to src/com/android/android/mail/internet/BinaryTempFileBody.java
diff --git a/src/com/android/k9/mail/internet/MimeBodyPart.java b/src/com/android/android/mail/internet/MimeBodyPart.java
similarity index 100%
rename from src/com/android/k9/mail/internet/MimeBodyPart.java
rename to src/com/android/android/mail/internet/MimeBodyPart.java
diff --git a/src/com/android/k9/mail/internet/MimeHeader.java b/src/com/android/android/mail/internet/MimeHeader.java
similarity index 100%
rename from src/com/android/k9/mail/internet/MimeHeader.java
rename to src/com/android/android/mail/internet/MimeHeader.java
diff --git a/src/com/android/k9/mail/internet/MimeMessage.java b/src/com/android/android/mail/internet/MimeMessage.java
similarity index 100%
rename from src/com/android/k9/mail/internet/MimeMessage.java
rename to src/com/android/android/mail/internet/MimeMessage.java
diff --git a/src/com/android/k9/mail/internet/MimeMultipart.java b/src/com/android/android/mail/internet/MimeMultipart.java
similarity index 100%
rename from src/com/android/k9/mail/internet/MimeMultipart.java
rename to src/com/android/android/mail/internet/MimeMultipart.java
diff --git a/src/com/android/k9/mail/internet/MimeUtility.java b/src/com/android/android/mail/internet/MimeUtility.java
similarity index 100%
rename from src/com/android/k9/mail/internet/MimeUtility.java
rename to src/com/android/android/mail/internet/MimeUtility.java
diff --git a/src/com/android/k9/mail/internet/TextBody.java b/src/com/android/android/mail/internet/TextBody.java
similarity index 100%
rename from src/com/android/k9/mail/internet/TextBody.java
rename to src/com/android/android/mail/internet/TextBody.java
diff --git a/src/com/android/k9/mail/store/ImapResponseParser.java b/src/com/android/android/mail/store/ImapResponseParser.java
similarity index 100%
rename from src/com/android/k9/mail/store/ImapResponseParser.java
rename to src/com/android/android/mail/store/ImapResponseParser.java
diff --git a/src/com/android/k9/mail/store/ImapStore.java b/src/com/android/android/mail/store/ImapStore.java
similarity index 100%
rename from src/com/android/k9/mail/store/ImapStore.java
rename to src/com/android/android/mail/store/ImapStore.java
diff --git a/src/com/android/k9/mail/store/LocalStore.java b/src/com/android/android/mail/store/LocalStore.java
similarity index 100%
rename from src/com/android/k9/mail/store/LocalStore.java
rename to src/com/android/android/mail/store/LocalStore.java
diff --git a/src/com/android/k9/mail/store/Pop3Store.java b/src/com/android/android/mail/store/Pop3Store.java
similarity index 100%
rename from src/com/android/k9/mail/store/Pop3Store.java
rename to src/com/android/android/mail/store/Pop3Store.java
diff --git a/src/com/android/k9/mail/store/TrustManagerFactory.java b/src/com/android/android/mail/store/TrustManagerFactory.java
similarity index 100%
rename from src/com/android/k9/mail/store/TrustManagerFactory.java
rename to src/com/android/android/mail/store/TrustManagerFactory.java
diff --git a/src/com/android/k9/mail/store/WebDavStore.java b/src/com/android/android/mail/store/WebDavStore.java
similarity index 100%
rename from src/com/android/k9/mail/store/WebDavStore.java
rename to src/com/android/android/mail/store/WebDavStore.java
diff --git a/src/com/android/k9/mail/transport/CountingOutputStream.java b/src/com/android/android/mail/transport/CountingOutputStream.java
similarity index 100%
rename from src/com/android/k9/mail/transport/CountingOutputStream.java
rename to src/com/android/android/mail/transport/CountingOutputStream.java
diff --git a/src/com/android/k9/mail/transport/EOLConvertingOutputStream.java b/src/com/android/android/mail/transport/EOLConvertingOutputStream.java
similarity index 100%
rename from src/com/android/k9/mail/transport/EOLConvertingOutputStream.java
rename to src/com/android/android/mail/transport/EOLConvertingOutputStream.java
diff --git a/src/com/android/k9/mail/transport/SmtpTransport.java b/src/com/android/android/mail/transport/SmtpTransport.java
similarity index 100%
rename from src/com/android/k9/mail/transport/SmtpTransport.java
rename to src/com/android/android/mail/transport/SmtpTransport.java
diff --git a/src/com/android/k9/mail/transport/StatusOutputStream.java b/src/com/android/android/mail/transport/StatusOutputStream.java
similarity index 100%
rename from src/com/android/k9/mail/transport/StatusOutputStream.java
rename to src/com/android/android/mail/transport/StatusOutputStream.java
diff --git a/src/com/android/k9/mail/transport/WebDavTransport.java b/src/com/android/android/mail/transport/WebDavTransport.java
similarity index 100%
rename from src/com/android/k9/mail/transport/WebDavTransport.java
rename to src/com/android/android/mail/transport/WebDavTransport.java
diff --git a/src/com/android/k9/provider/AttachmentProvider.java b/src/com/android/android/provider/AttachmentProvider.java
similarity index 100%
rename from src/com/android/k9/provider/AttachmentProvider.java
rename to src/com/android/android/provider/AttachmentProvider.java
diff --git a/src/com/android/k9/service/BootReceiver.java b/src/com/android/android/service/BootReceiver.java
similarity index 100%
rename from src/com/android/k9/service/BootReceiver.java
rename to src/com/android/android/service/BootReceiver.java
diff --git a/src/com/android/k9/service/MailService.java b/src/com/android/android/service/MailService.java
similarity index 100%
rename from src/com/android/k9/service/MailService.java
rename to src/com/android/android/service/MailService.java