Split out emailcommon/Android.mk
Change-Id: I846ee2a4b541f4709e647aa537c61549db2bec2e
diff --git a/Android.mk b/Android.mk
index 1a84cf5..aea26d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,29 +41,8 @@
include $(BUILD_PACKAGE)
-# only include rules to build other stuff for the original package, not derived package.
+# only include rules to build other stuff for the original package, not the derived package.
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-
-# Build the com.android.emailcommon static library. At the moment, this includes
-# the emailcommon files themselves plus everything under src/org (apache code). All of our
-# AIDL files are also compiled into the static library
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := com.android.emailcommon
-LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
-LOCAL_SRC_FILES += $(call all-java-files-under, src/org)
-LOCAL_SRC_FILES += \
- src/com/android/emailcommon/service/IEmailService.aidl \
- src/com/android/emailcommon/service/IEmailServiceCallback.aidl \
- src/com/android/emailcommon/service/IPolicyService.aidl \
- src/com/android/emailcommon/service/IAccountService.aidl
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
# additionally, build unit tests in a separate .apk
include $(call all-makefiles-under,$(LOCAL_PATH))
-
endif
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 661a79c..81f5bfd 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,7 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/emailcommon/Android.mk b/emailcommon/Android.mk
new file mode 100644
index 0000000..2cfd1a1
--- /dev/null
+++ b/emailcommon/Android.mk
@@ -0,0 +1,34 @@
+# Copyright 2011, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# Build the com.android.emailcommon static library. At the moment, this includes
+# the emailcommon files themselves plus everything under src/org (apache code). All of our
+# AIDL files are also compiled into the static library
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := com.android.emailcommon
+LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
+LOCAL_SRC_FILES += $(call all-java-files-under, src/org)
+LOCAL_SRC_FILES += \
+ src/com/android/emailcommon/service/IEmailService.aidl \
+ src/com/android/emailcommon/service/IEmailServiceCallback.aidl \
+ src/com/android/emailcommon/service/IPolicyService.aidl \
+ src/com/android/emailcommon/service/IAccountService.aidl
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/src/com/android/emailcommon/AccountManagerTypes.java b/emailcommon/src/com/android/emailcommon/AccountManagerTypes.java
similarity index 100%
rename from src/com/android/emailcommon/AccountManagerTypes.java
rename to emailcommon/src/com/android/emailcommon/AccountManagerTypes.java
diff --git a/src/com/android/emailcommon/Api.java b/emailcommon/src/com/android/emailcommon/Api.java
similarity index 100%
rename from src/com/android/emailcommon/Api.java
rename to emailcommon/src/com/android/emailcommon/Api.java
diff --git a/src/com/android/emailcommon/CalendarProviderStub.java b/emailcommon/src/com/android/emailcommon/CalendarProviderStub.java
similarity index 100%
rename from src/com/android/emailcommon/CalendarProviderStub.java
rename to emailcommon/src/com/android/emailcommon/CalendarProviderStub.java
diff --git a/src/com/android/emailcommon/Configuration.java b/emailcommon/src/com/android/emailcommon/Configuration.java
similarity index 100%
rename from src/com/android/emailcommon/Configuration.java
rename to emailcommon/src/com/android/emailcommon/Configuration.java
diff --git a/src/com/android/emailcommon/Device.java b/emailcommon/src/com/android/emailcommon/Device.java
similarity index 100%
rename from src/com/android/emailcommon/Device.java
rename to emailcommon/src/com/android/emailcommon/Device.java
diff --git a/src/com/android/emailcommon/Logging.java b/emailcommon/src/com/android/emailcommon/Logging.java
similarity index 100%
rename from src/com/android/emailcommon/Logging.java
rename to emailcommon/src/com/android/emailcommon/Logging.java
diff --git a/src/com/android/emailcommon/TempDirectory.java b/emailcommon/src/com/android/emailcommon/TempDirectory.java
similarity index 100%
rename from src/com/android/emailcommon/TempDirectory.java
rename to emailcommon/src/com/android/emailcommon/TempDirectory.java
diff --git a/src/com/android/emailcommon/internet/BinaryTempFileBody.java b/emailcommon/src/com/android/emailcommon/internet/BinaryTempFileBody.java
similarity index 100%
rename from src/com/android/emailcommon/internet/BinaryTempFileBody.java
rename to emailcommon/src/com/android/emailcommon/internet/BinaryTempFileBody.java
diff --git a/src/com/android/emailcommon/internet/MimeBodyPart.java b/emailcommon/src/com/android/emailcommon/internet/MimeBodyPart.java
similarity index 100%
rename from src/com/android/emailcommon/internet/MimeBodyPart.java
rename to emailcommon/src/com/android/emailcommon/internet/MimeBodyPart.java
diff --git a/src/com/android/emailcommon/internet/MimeHeader.java b/emailcommon/src/com/android/emailcommon/internet/MimeHeader.java
similarity index 100%
rename from src/com/android/emailcommon/internet/MimeHeader.java
rename to emailcommon/src/com/android/emailcommon/internet/MimeHeader.java
diff --git a/src/com/android/emailcommon/internet/MimeMessage.java b/emailcommon/src/com/android/emailcommon/internet/MimeMessage.java
similarity index 100%
rename from src/com/android/emailcommon/internet/MimeMessage.java
rename to emailcommon/src/com/android/emailcommon/internet/MimeMessage.java
diff --git a/src/com/android/emailcommon/internet/MimeMultipart.java b/emailcommon/src/com/android/emailcommon/internet/MimeMultipart.java
similarity index 100%
rename from src/com/android/emailcommon/internet/MimeMultipart.java
rename to emailcommon/src/com/android/emailcommon/internet/MimeMultipart.java
diff --git a/src/com/android/emailcommon/internet/MimeUtility.java b/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java
similarity index 100%
rename from src/com/android/emailcommon/internet/MimeUtility.java
rename to emailcommon/src/com/android/emailcommon/internet/MimeUtility.java
diff --git a/src/com/android/emailcommon/internet/Rfc822Output.java b/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
similarity index 100%
rename from src/com/android/emailcommon/internet/Rfc822Output.java
rename to emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
diff --git a/src/com/android/emailcommon/internet/TextBody.java b/emailcommon/src/com/android/emailcommon/internet/TextBody.java
similarity index 100%
rename from src/com/android/emailcommon/internet/TextBody.java
rename to emailcommon/src/com/android/emailcommon/internet/TextBody.java
diff --git a/src/com/android/emailcommon/mail/Address.java b/emailcommon/src/com/android/emailcommon/mail/Address.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Address.java
rename to emailcommon/src/com/android/emailcommon/mail/Address.java
diff --git a/src/com/android/emailcommon/mail/AuthenticationFailedException.java b/emailcommon/src/com/android/emailcommon/mail/AuthenticationFailedException.java
similarity index 100%
rename from src/com/android/emailcommon/mail/AuthenticationFailedException.java
rename to emailcommon/src/com/android/emailcommon/mail/AuthenticationFailedException.java
diff --git a/src/com/android/emailcommon/mail/Body.java b/emailcommon/src/com/android/emailcommon/mail/Body.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Body.java
rename to emailcommon/src/com/android/emailcommon/mail/Body.java
diff --git a/src/com/android/emailcommon/mail/BodyPart.java b/emailcommon/src/com/android/emailcommon/mail/BodyPart.java
similarity index 100%
rename from src/com/android/emailcommon/mail/BodyPart.java
rename to emailcommon/src/com/android/emailcommon/mail/BodyPart.java
diff --git a/src/com/android/emailcommon/mail/CertificateValidationException.java b/emailcommon/src/com/android/emailcommon/mail/CertificateValidationException.java
similarity index 100%
rename from src/com/android/emailcommon/mail/CertificateValidationException.java
rename to emailcommon/src/com/android/emailcommon/mail/CertificateValidationException.java
diff --git a/src/com/android/emailcommon/mail/FetchProfile.java b/emailcommon/src/com/android/emailcommon/mail/FetchProfile.java
similarity index 100%
rename from src/com/android/emailcommon/mail/FetchProfile.java
rename to emailcommon/src/com/android/emailcommon/mail/FetchProfile.java
diff --git a/src/com/android/emailcommon/mail/Fetchable.java b/emailcommon/src/com/android/emailcommon/mail/Fetchable.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Fetchable.java
rename to emailcommon/src/com/android/emailcommon/mail/Fetchable.java
diff --git a/src/com/android/emailcommon/mail/Flag.java b/emailcommon/src/com/android/emailcommon/mail/Flag.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Flag.java
rename to emailcommon/src/com/android/emailcommon/mail/Flag.java
diff --git a/src/com/android/emailcommon/mail/Folder.java b/emailcommon/src/com/android/emailcommon/mail/Folder.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Folder.java
rename to emailcommon/src/com/android/emailcommon/mail/Folder.java
diff --git a/src/com/android/emailcommon/mail/MeetingInfo.java b/emailcommon/src/com/android/emailcommon/mail/MeetingInfo.java
similarity index 100%
rename from src/com/android/emailcommon/mail/MeetingInfo.java
rename to emailcommon/src/com/android/emailcommon/mail/MeetingInfo.java
diff --git a/src/com/android/emailcommon/mail/Message.java b/emailcommon/src/com/android/emailcommon/mail/Message.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Message.java
rename to emailcommon/src/com/android/emailcommon/mail/Message.java
diff --git a/src/com/android/emailcommon/mail/MessageDateComparator.java b/emailcommon/src/com/android/emailcommon/mail/MessageDateComparator.java
similarity index 100%
rename from src/com/android/emailcommon/mail/MessageDateComparator.java
rename to emailcommon/src/com/android/emailcommon/mail/MessageDateComparator.java
diff --git a/src/com/android/emailcommon/mail/MessagingException.java b/emailcommon/src/com/android/emailcommon/mail/MessagingException.java
similarity index 100%
rename from src/com/android/emailcommon/mail/MessagingException.java
rename to emailcommon/src/com/android/emailcommon/mail/MessagingException.java
diff --git a/src/com/android/emailcommon/mail/Multipart.java b/emailcommon/src/com/android/emailcommon/mail/Multipart.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Multipart.java
rename to emailcommon/src/com/android/emailcommon/mail/Multipart.java
diff --git a/src/com/android/emailcommon/mail/PackedString.java b/emailcommon/src/com/android/emailcommon/mail/PackedString.java
similarity index 100%
rename from src/com/android/emailcommon/mail/PackedString.java
rename to emailcommon/src/com/android/emailcommon/mail/PackedString.java
diff --git a/src/com/android/emailcommon/mail/Part.java b/emailcommon/src/com/android/emailcommon/mail/Part.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Part.java
rename to emailcommon/src/com/android/emailcommon/mail/Part.java
diff --git a/src/com/android/emailcommon/mail/Snippet.java b/emailcommon/src/com/android/emailcommon/mail/Snippet.java
similarity index 100%
rename from src/com/android/emailcommon/mail/Snippet.java
rename to emailcommon/src/com/android/emailcommon/mail/Snippet.java
diff --git a/src/com/android/emailcommon/provider/EmailContent.aidl b/emailcommon/src/com/android/emailcommon/provider/EmailContent.aidl
similarity index 100%
rename from src/com/android/emailcommon/provider/EmailContent.aidl
rename to emailcommon/src/com/android/emailcommon/provider/EmailContent.aidl
diff --git a/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
similarity index 100%
rename from src/com/android/emailcommon/provider/EmailContent.java
rename to emailcommon/src/com/android/emailcommon/provider/EmailContent.java
diff --git a/src/com/android/emailcommon/service/AccountServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java
similarity index 100%
rename from src/com/android/emailcommon/service/AccountServiceProxy.java
rename to emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java
diff --git a/src/com/android/emailcommon/service/EmailServiceConstants.java b/emailcommon/src/com/android/emailcommon/service/EmailServiceConstants.java
similarity index 100%
rename from src/com/android/emailcommon/service/EmailServiceConstants.java
rename to emailcommon/src/com/android/emailcommon/service/EmailServiceConstants.java
diff --git a/src/com/android/emailcommon/service/EmailServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
similarity index 100%
rename from src/com/android/emailcommon/service/EmailServiceProxy.java
rename to emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
diff --git a/src/com/android/emailcommon/service/EmailServiceStatus.java b/emailcommon/src/com/android/emailcommon/service/EmailServiceStatus.java
similarity index 100%
rename from src/com/android/emailcommon/service/EmailServiceStatus.java
rename to emailcommon/src/com/android/emailcommon/service/EmailServiceStatus.java
diff --git a/src/com/android/emailcommon/service/IAccountService.aidl b/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl
similarity index 100%
rename from src/com/android/emailcommon/service/IAccountService.aidl
rename to emailcommon/src/com/android/emailcommon/service/IAccountService.aidl
diff --git a/src/com/android/emailcommon/service/IEmailService.aidl b/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
similarity index 100%
rename from src/com/android/emailcommon/service/IEmailService.aidl
rename to emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
diff --git a/src/com/android/emailcommon/service/IEmailServiceCallback.aidl b/emailcommon/src/com/android/emailcommon/service/IEmailServiceCallback.aidl
similarity index 100%
rename from src/com/android/emailcommon/service/IEmailServiceCallback.aidl
rename to emailcommon/src/com/android/emailcommon/service/IEmailServiceCallback.aidl
diff --git a/src/com/android/emailcommon/service/IPolicyService.aidl b/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl
similarity index 100%
rename from src/com/android/emailcommon/service/IPolicyService.aidl
rename to emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl
diff --git a/src/com/android/emailcommon/service/PolicyServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
similarity index 100%
rename from src/com/android/emailcommon/service/PolicyServiceProxy.java
rename to emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
diff --git a/src/com/android/emailcommon/service/PolicySet.aidl b/emailcommon/src/com/android/emailcommon/service/PolicySet.aidl
similarity index 100%
rename from src/com/android/emailcommon/service/PolicySet.aidl
rename to emailcommon/src/com/android/emailcommon/service/PolicySet.aidl
diff --git a/src/com/android/emailcommon/service/PolicySet.java b/emailcommon/src/com/android/emailcommon/service/PolicySet.java
similarity index 100%
rename from src/com/android/emailcommon/service/PolicySet.java
rename to emailcommon/src/com/android/emailcommon/service/PolicySet.java
diff --git a/src/com/android/emailcommon/service/ServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
similarity index 100%
rename from src/com/android/emailcommon/service/ServiceProxy.java
rename to emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
diff --git a/src/com/android/emailcommon/service/SyncWindow.java b/emailcommon/src/com/android/emailcommon/service/SyncWindow.java
similarity index 100%
rename from src/com/android/emailcommon/service/SyncWindow.java
rename to emailcommon/src/com/android/emailcommon/service/SyncWindow.java
diff --git a/src/com/android/emailcommon/utility/AccountReconciler.java b/emailcommon/src/com/android/emailcommon/utility/AccountReconciler.java
similarity index 100%
rename from src/com/android/emailcommon/utility/AccountReconciler.java
rename to emailcommon/src/com/android/emailcommon/utility/AccountReconciler.java
diff --git a/src/com/android/emailcommon/utility/AttachmentUtilities.java b/emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java
similarity index 100%
rename from src/com/android/emailcommon/utility/AttachmentUtilities.java
rename to emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java
diff --git a/src/com/android/emailcommon/utility/ConversionUtilities.java b/emailcommon/src/com/android/emailcommon/utility/ConversionUtilities.java
similarity index 100%
rename from src/com/android/emailcommon/utility/ConversionUtilities.java
rename to emailcommon/src/com/android/emailcommon/utility/ConversionUtilities.java
diff --git a/src/com/android/emailcommon/utility/LoggingInputStream.java b/emailcommon/src/com/android/emailcommon/utility/LoggingInputStream.java
similarity index 100%
rename from src/com/android/emailcommon/utility/LoggingInputStream.java
rename to emailcommon/src/com/android/emailcommon/utility/LoggingInputStream.java
diff --git a/src/com/android/emailcommon/utility/SSLUtils.java b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
similarity index 100%
rename from src/com/android/emailcommon/utility/SSLUtils.java
rename to emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
diff --git a/src/com/android/emailcommon/utility/Utility.java b/emailcommon/src/com/android/emailcommon/utility/Utility.java
similarity index 100%
rename from src/com/android/emailcommon/utility/Utility.java
rename to emailcommon/src/com/android/emailcommon/utility/Utility.java
diff --git a/src/org/apache/commons/io/CopyUtils.java b/emailcommon/src/org/apache/commons/io/CopyUtils.java
similarity index 100%
rename from src/org/apache/commons/io/CopyUtils.java
rename to emailcommon/src/org/apache/commons/io/CopyUtils.java
diff --git a/src/org/apache/commons/io/DirectoryWalker.java b/emailcommon/src/org/apache/commons/io/DirectoryWalker.java
similarity index 100%
rename from src/org/apache/commons/io/DirectoryWalker.java
rename to emailcommon/src/org/apache/commons/io/DirectoryWalker.java
diff --git a/src/org/apache/commons/io/EndianUtils.java b/emailcommon/src/org/apache/commons/io/EndianUtils.java
similarity index 100%
rename from src/org/apache/commons/io/EndianUtils.java
rename to emailcommon/src/org/apache/commons/io/EndianUtils.java
diff --git a/src/org/apache/commons/io/FileCleaner.java b/emailcommon/src/org/apache/commons/io/FileCleaner.java
similarity index 100%
rename from src/org/apache/commons/io/FileCleaner.java
rename to emailcommon/src/org/apache/commons/io/FileCleaner.java
diff --git a/src/org/apache/commons/io/FileCleaningTracker.java b/emailcommon/src/org/apache/commons/io/FileCleaningTracker.java
similarity index 100%
rename from src/org/apache/commons/io/FileCleaningTracker.java
rename to emailcommon/src/org/apache/commons/io/FileCleaningTracker.java
diff --git a/src/org/apache/commons/io/FileDeleteStrategy.java b/emailcommon/src/org/apache/commons/io/FileDeleteStrategy.java
similarity index 100%
rename from src/org/apache/commons/io/FileDeleteStrategy.java
rename to emailcommon/src/org/apache/commons/io/FileDeleteStrategy.java
diff --git a/src/org/apache/commons/io/FileSystemUtils.java b/emailcommon/src/org/apache/commons/io/FileSystemUtils.java
similarity index 100%
rename from src/org/apache/commons/io/FileSystemUtils.java
rename to emailcommon/src/org/apache/commons/io/FileSystemUtils.java
diff --git a/src/org/apache/commons/io/FileUtils.java b/emailcommon/src/org/apache/commons/io/FileUtils.java
similarity index 100%
rename from src/org/apache/commons/io/FileUtils.java
rename to emailcommon/src/org/apache/commons/io/FileUtils.java
diff --git a/src/org/apache/commons/io/FilenameUtils.java b/emailcommon/src/org/apache/commons/io/FilenameUtils.java
similarity index 100%
rename from src/org/apache/commons/io/FilenameUtils.java
rename to emailcommon/src/org/apache/commons/io/FilenameUtils.java
diff --git a/src/org/apache/commons/io/HexDump.java b/emailcommon/src/org/apache/commons/io/HexDump.java
similarity index 100%
rename from src/org/apache/commons/io/HexDump.java
rename to emailcommon/src/org/apache/commons/io/HexDump.java
diff --git a/src/org/apache/commons/io/IOCase.java b/emailcommon/src/org/apache/commons/io/IOCase.java
similarity index 100%
rename from src/org/apache/commons/io/IOCase.java
rename to emailcommon/src/org/apache/commons/io/IOCase.java
diff --git a/src/org/apache/commons/io/IOExceptionWithCause.java b/emailcommon/src/org/apache/commons/io/IOExceptionWithCause.java
similarity index 100%
rename from src/org/apache/commons/io/IOExceptionWithCause.java
rename to emailcommon/src/org/apache/commons/io/IOExceptionWithCause.java
diff --git a/src/org/apache/commons/io/IOUtils.java b/emailcommon/src/org/apache/commons/io/IOUtils.java
similarity index 100%
rename from src/org/apache/commons/io/IOUtils.java
rename to emailcommon/src/org/apache/commons/io/IOUtils.java
diff --git a/src/org/apache/commons/io/LineIterator.java b/emailcommon/src/org/apache/commons/io/LineIterator.java
similarity index 100%
rename from src/org/apache/commons/io/LineIterator.java
rename to emailcommon/src/org/apache/commons/io/LineIterator.java
diff --git a/src/org/apache/commons/io/ThirdPartyProject.prop b/emailcommon/src/org/apache/commons/io/ThirdPartyProject.prop
similarity index 100%
rename from src/org/apache/commons/io/ThirdPartyProject.prop
rename to emailcommon/src/org/apache/commons/io/ThirdPartyProject.prop
diff --git a/src/org/apache/commons/io/comparator/DefaultFileComparator.java b/emailcommon/src/org/apache/commons/io/comparator/DefaultFileComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/DefaultFileComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/DefaultFileComparator.java
diff --git a/src/org/apache/commons/io/comparator/ExtensionFileComparator.java b/emailcommon/src/org/apache/commons/io/comparator/ExtensionFileComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/ExtensionFileComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/ExtensionFileComparator.java
diff --git a/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java b/emailcommon/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/LastModifiedFileComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java
diff --git a/src/org/apache/commons/io/comparator/NameFileComparator.java b/emailcommon/src/org/apache/commons/io/comparator/NameFileComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/NameFileComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/NameFileComparator.java
diff --git a/src/org/apache/commons/io/comparator/PathFileComparator.java b/emailcommon/src/org/apache/commons/io/comparator/PathFileComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/PathFileComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/PathFileComparator.java
diff --git a/src/org/apache/commons/io/comparator/ReverseComparator.java b/emailcommon/src/org/apache/commons/io/comparator/ReverseComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/ReverseComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/ReverseComparator.java
diff --git a/src/org/apache/commons/io/comparator/SizeFileComparator.java b/emailcommon/src/org/apache/commons/io/comparator/SizeFileComparator.java
similarity index 100%
rename from src/org/apache/commons/io/comparator/SizeFileComparator.java
rename to emailcommon/src/org/apache/commons/io/comparator/SizeFileComparator.java
diff --git a/src/org/apache/commons/io/comparator/package.html b/emailcommon/src/org/apache/commons/io/comparator/package.html
similarity index 100%
rename from src/org/apache/commons/io/comparator/package.html
rename to emailcommon/src/org/apache/commons/io/comparator/package.html
diff --git a/src/org/apache/commons/io/filefilter/AbstractFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/AbstractFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/AbstractFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/AbstractFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/AgeFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/AgeFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/AgeFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/AgeFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/AndFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/AndFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/AndFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/AndFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/CanReadFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/CanReadFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/CanReadFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/CanReadFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/CanWriteFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/ConditionalFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/DelegateFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/DelegateFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/DelegateFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/DelegateFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/DirectoryFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/EmptyFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/EmptyFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/EmptyFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/EmptyFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/FalseFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/FalseFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/FalseFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/FalseFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/FileFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/FileFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/FileFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/FileFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/FileFilterUtils.java b/emailcommon/src/org/apache/commons/io/filefilter/FileFilterUtils.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/FileFilterUtils.java
rename to emailcommon/src/org/apache/commons/io/filefilter/FileFilterUtils.java
diff --git a/src/org/apache/commons/io/filefilter/HiddenFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/HiddenFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/HiddenFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/HiddenFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/IOFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/IOFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/IOFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/IOFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/NameFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/NameFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/NameFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/NameFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/NotFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/NotFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/NotFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/NotFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/OrFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/OrFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/OrFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/OrFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/PrefixFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/PrefixFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/PrefixFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/PrefixFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/RegexFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/RegexFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/RegexFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/RegexFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/SizeFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/SizeFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/SizeFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/SizeFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/SuffixFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/SuffixFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/SuffixFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/SuffixFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/TrueFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/TrueFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/TrueFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/TrueFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/WildcardFileFilter.java b/emailcommon/src/org/apache/commons/io/filefilter/WildcardFileFilter.java
similarity index 100%
rename from src/org/apache/commons/io/filefilter/WildcardFileFilter.java
rename to emailcommon/src/org/apache/commons/io/filefilter/WildcardFileFilter.java
diff --git a/src/org/apache/commons/io/filefilter/package.html b/emailcommon/src/org/apache/commons/io/filefilter/package.html
similarity index 100%
rename from src/org/apache/commons/io/filefilter/package.html
rename to emailcommon/src/org/apache/commons/io/filefilter/package.html
diff --git a/src/org/apache/commons/io/input/AutoCloseInputStream.java b/emailcommon/src/org/apache/commons/io/input/AutoCloseInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/AutoCloseInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/AutoCloseInputStream.java
diff --git a/src/org/apache/commons/io/input/CharSequenceReader.java b/emailcommon/src/org/apache/commons/io/input/CharSequenceReader.java
similarity index 100%
rename from src/org/apache/commons/io/input/CharSequenceReader.java
rename to emailcommon/src/org/apache/commons/io/input/CharSequenceReader.java
diff --git a/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java b/emailcommon/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
diff --git a/src/org/apache/commons/io/input/CloseShieldInputStream.java b/emailcommon/src/org/apache/commons/io/input/CloseShieldInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/CloseShieldInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/CloseShieldInputStream.java
diff --git a/src/org/apache/commons/io/input/ClosedInputStream.java b/emailcommon/src/org/apache/commons/io/input/ClosedInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/ClosedInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/ClosedInputStream.java
diff --git a/src/org/apache/commons/io/input/CountingInputStream.java b/emailcommon/src/org/apache/commons/io/input/CountingInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/CountingInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/CountingInputStream.java
diff --git a/src/org/apache/commons/io/input/DemuxInputStream.java b/emailcommon/src/org/apache/commons/io/input/DemuxInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/DemuxInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/DemuxInputStream.java
diff --git a/src/org/apache/commons/io/input/NullInputStream.java b/emailcommon/src/org/apache/commons/io/input/NullInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/NullInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/NullInputStream.java
diff --git a/src/org/apache/commons/io/input/NullReader.java b/emailcommon/src/org/apache/commons/io/input/NullReader.java
similarity index 100%
rename from src/org/apache/commons/io/input/NullReader.java
rename to emailcommon/src/org/apache/commons/io/input/NullReader.java
diff --git a/src/org/apache/commons/io/input/ProxyInputStream.java b/emailcommon/src/org/apache/commons/io/input/ProxyInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/ProxyInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/ProxyInputStream.java
diff --git a/src/org/apache/commons/io/input/ProxyReader.java b/emailcommon/src/org/apache/commons/io/input/ProxyReader.java
similarity index 100%
rename from src/org/apache/commons/io/input/ProxyReader.java
rename to emailcommon/src/org/apache/commons/io/input/ProxyReader.java
diff --git a/src/org/apache/commons/io/input/SwappedDataInputStream.java b/emailcommon/src/org/apache/commons/io/input/SwappedDataInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/SwappedDataInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/SwappedDataInputStream.java
diff --git a/src/org/apache/commons/io/input/TeeInputStream.java b/emailcommon/src/org/apache/commons/io/input/TeeInputStream.java
similarity index 100%
rename from src/org/apache/commons/io/input/TeeInputStream.java
rename to emailcommon/src/org/apache/commons/io/input/TeeInputStream.java
diff --git a/src/org/apache/commons/io/input/package.html b/emailcommon/src/org/apache/commons/io/input/package.html
similarity index 100%
rename from src/org/apache/commons/io/input/package.html
rename to emailcommon/src/org/apache/commons/io/input/package.html
diff --git a/src/org/apache/commons/io/output/ByteArrayOutputStream.java b/emailcommon/src/org/apache/commons/io/output/ByteArrayOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/ByteArrayOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/ByteArrayOutputStream.java
diff --git a/src/org/apache/commons/io/output/CloseShieldOutputStream.java b/emailcommon/src/org/apache/commons/io/output/CloseShieldOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/CloseShieldOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/CloseShieldOutputStream.java
diff --git a/src/org/apache/commons/io/output/ClosedOutputStream.java b/emailcommon/src/org/apache/commons/io/output/ClosedOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/ClosedOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/ClosedOutputStream.java
diff --git a/src/org/apache/commons/io/output/CountingOutputStream.java b/emailcommon/src/org/apache/commons/io/output/CountingOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/CountingOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/CountingOutputStream.java
diff --git a/src/org/apache/commons/io/output/DeferredFileOutputStream.java b/emailcommon/src/org/apache/commons/io/output/DeferredFileOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/DeferredFileOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/DeferredFileOutputStream.java
diff --git a/src/org/apache/commons/io/output/DemuxOutputStream.java b/emailcommon/src/org/apache/commons/io/output/DemuxOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/DemuxOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/DemuxOutputStream.java
diff --git a/src/org/apache/commons/io/output/FileWriterWithEncoding.java b/emailcommon/src/org/apache/commons/io/output/FileWriterWithEncoding.java
similarity index 100%
rename from src/org/apache/commons/io/output/FileWriterWithEncoding.java
rename to emailcommon/src/org/apache/commons/io/output/FileWriterWithEncoding.java
diff --git a/src/org/apache/commons/io/output/LockableFileWriter.java b/emailcommon/src/org/apache/commons/io/output/LockableFileWriter.java
similarity index 100%
rename from src/org/apache/commons/io/output/LockableFileWriter.java
rename to emailcommon/src/org/apache/commons/io/output/LockableFileWriter.java
diff --git a/src/org/apache/commons/io/output/NullOutputStream.java b/emailcommon/src/org/apache/commons/io/output/NullOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/NullOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/NullOutputStream.java
diff --git a/src/org/apache/commons/io/output/NullWriter.java b/emailcommon/src/org/apache/commons/io/output/NullWriter.java
similarity index 100%
rename from src/org/apache/commons/io/output/NullWriter.java
rename to emailcommon/src/org/apache/commons/io/output/NullWriter.java
diff --git a/src/org/apache/commons/io/output/ProxyOutputStream.java b/emailcommon/src/org/apache/commons/io/output/ProxyOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/ProxyOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/ProxyOutputStream.java
diff --git a/src/org/apache/commons/io/output/ProxyWriter.java b/emailcommon/src/org/apache/commons/io/output/ProxyWriter.java
similarity index 100%
rename from src/org/apache/commons/io/output/ProxyWriter.java
rename to emailcommon/src/org/apache/commons/io/output/ProxyWriter.java
diff --git a/src/org/apache/commons/io/output/TeeOutputStream.java b/emailcommon/src/org/apache/commons/io/output/TeeOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/TeeOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/TeeOutputStream.java
diff --git a/src/org/apache/commons/io/output/ThresholdingOutputStream.java b/emailcommon/src/org/apache/commons/io/output/ThresholdingOutputStream.java
similarity index 100%
rename from src/org/apache/commons/io/output/ThresholdingOutputStream.java
rename to emailcommon/src/org/apache/commons/io/output/ThresholdingOutputStream.java
diff --git a/src/org/apache/commons/io/output/package.html b/emailcommon/src/org/apache/commons/io/output/package.html
similarity index 100%
rename from src/org/apache/commons/io/output/package.html
rename to emailcommon/src/org/apache/commons/io/output/package.html
diff --git a/src/org/apache/commons/io/overview.html b/emailcommon/src/org/apache/commons/io/overview.html
similarity index 100%
rename from src/org/apache/commons/io/overview.html
rename to emailcommon/src/org/apache/commons/io/overview.html
diff --git a/src/org/apache/commons/io/package.html b/emailcommon/src/org/apache/commons/io/package.html
similarity index 100%
rename from src/org/apache/commons/io/package.html
rename to emailcommon/src/org/apache/commons/io/package.html
diff --git a/src/org/apache/james/mime4j/AbstractContentHandler.java b/emailcommon/src/org/apache/james/mime4j/AbstractContentHandler.java
similarity index 100%
rename from src/org/apache/james/mime4j/AbstractContentHandler.java
rename to emailcommon/src/org/apache/james/mime4j/AbstractContentHandler.java
diff --git a/src/org/apache/james/mime4j/BodyDescriptor.java b/emailcommon/src/org/apache/james/mime4j/BodyDescriptor.java
similarity index 100%
rename from src/org/apache/james/mime4j/BodyDescriptor.java
rename to emailcommon/src/org/apache/james/mime4j/BodyDescriptor.java
diff --git a/src/org/apache/james/mime4j/CloseShieldInputStream.java b/emailcommon/src/org/apache/james/mime4j/CloseShieldInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/CloseShieldInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/CloseShieldInputStream.java
diff --git a/src/org/apache/james/mime4j/ContentHandler.java b/emailcommon/src/org/apache/james/mime4j/ContentHandler.java
similarity index 100%
rename from src/org/apache/james/mime4j/ContentHandler.java
rename to emailcommon/src/org/apache/james/mime4j/ContentHandler.java
diff --git a/src/org/apache/james/mime4j/EOLConvertingInputStream.java b/emailcommon/src/org/apache/james/mime4j/EOLConvertingInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/EOLConvertingInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/EOLConvertingInputStream.java
diff --git a/src/org/apache/james/mime4j/Log.java b/emailcommon/src/org/apache/james/mime4j/Log.java
similarity index 100%
rename from src/org/apache/james/mime4j/Log.java
rename to emailcommon/src/org/apache/james/mime4j/Log.java
diff --git a/src/org/apache/james/mime4j/LogFactory.java b/emailcommon/src/org/apache/james/mime4j/LogFactory.java
similarity index 100%
rename from src/org/apache/james/mime4j/LogFactory.java
rename to emailcommon/src/org/apache/james/mime4j/LogFactory.java
diff --git a/src/org/apache/james/mime4j/MimeBoundaryInputStream.java b/emailcommon/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/MimeBoundaryInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
diff --git a/src/org/apache/james/mime4j/MimeStreamParser.java b/emailcommon/src/org/apache/james/mime4j/MimeStreamParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/MimeStreamParser.java
rename to emailcommon/src/org/apache/james/mime4j/MimeStreamParser.java
diff --git a/src/org/apache/james/mime4j/RootInputStream.java b/emailcommon/src/org/apache/james/mime4j/RootInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/RootInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/RootInputStream.java
diff --git a/src/org/apache/james/mime4j/SimpleContentHandler.java b/emailcommon/src/org/apache/james/mime4j/SimpleContentHandler.java
similarity index 100%
rename from src/org/apache/james/mime4j/SimpleContentHandler.java
rename to emailcommon/src/org/apache/james/mime4j/SimpleContentHandler.java
diff --git a/src/org/apache/james/mime4j/ThirdPartyProject.prop b/emailcommon/src/org/apache/james/mime4j/ThirdPartyProject.prop
similarity index 100%
rename from src/org/apache/james/mime4j/ThirdPartyProject.prop
rename to emailcommon/src/org/apache/james/mime4j/ThirdPartyProject.prop
diff --git a/src/org/apache/james/mime4j/codec/EncoderUtil.java b/emailcommon/src/org/apache/james/mime4j/codec/EncoderUtil.java
similarity index 100%
rename from src/org/apache/james/mime4j/codec/EncoderUtil.java
rename to emailcommon/src/org/apache/james/mime4j/codec/EncoderUtil.java
diff --git a/src/org/apache/james/mime4j/decoder/Base64InputStream.java b/emailcommon/src/org/apache/james/mime4j/decoder/Base64InputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/decoder/Base64InputStream.java
rename to emailcommon/src/org/apache/james/mime4j/decoder/Base64InputStream.java
diff --git a/src/org/apache/james/mime4j/decoder/ByteQueue.java b/emailcommon/src/org/apache/james/mime4j/decoder/ByteQueue.java
similarity index 100%
rename from src/org/apache/james/mime4j/decoder/ByteQueue.java
rename to emailcommon/src/org/apache/james/mime4j/decoder/ByteQueue.java
diff --git a/src/org/apache/james/mime4j/decoder/DecoderUtil.java b/emailcommon/src/org/apache/james/mime4j/decoder/DecoderUtil.java
similarity index 100%
rename from src/org/apache/james/mime4j/decoder/DecoderUtil.java
rename to emailcommon/src/org/apache/james/mime4j/decoder/DecoderUtil.java
diff --git a/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java b/emailcommon/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
diff --git a/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java b/emailcommon/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
similarity index 100%
rename from src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
rename to emailcommon/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
diff --git a/src/org/apache/james/mime4j/field/AddressListField.java b/emailcommon/src/org/apache/james/mime4j/field/AddressListField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/AddressListField.java
rename to emailcommon/src/org/apache/james/mime4j/field/AddressListField.java
diff --git a/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java b/emailcommon/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
rename to emailcommon/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
diff --git a/src/org/apache/james/mime4j/field/ContentTypeField.java b/emailcommon/src/org/apache/james/mime4j/field/ContentTypeField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/ContentTypeField.java
rename to emailcommon/src/org/apache/james/mime4j/field/ContentTypeField.java
diff --git a/src/org/apache/james/mime4j/field/DateTimeField.java b/emailcommon/src/org/apache/james/mime4j/field/DateTimeField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/DateTimeField.java
rename to emailcommon/src/org/apache/james/mime4j/field/DateTimeField.java
diff --git a/src/org/apache/james/mime4j/field/DefaultFieldParser.java b/emailcommon/src/org/apache/james/mime4j/field/DefaultFieldParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/DefaultFieldParser.java
rename to emailcommon/src/org/apache/james/mime4j/field/DefaultFieldParser.java
diff --git a/src/org/apache/james/mime4j/field/DelegatingFieldParser.java b/emailcommon/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/DelegatingFieldParser.java
rename to emailcommon/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
diff --git a/src/org/apache/james/mime4j/field/Field.java b/emailcommon/src/org/apache/james/mime4j/field/Field.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/Field.java
rename to emailcommon/src/org/apache/james/mime4j/field/Field.java
diff --git a/src/org/apache/james/mime4j/field/FieldParser.java b/emailcommon/src/org/apache/james/mime4j/field/FieldParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/FieldParser.java
rename to emailcommon/src/org/apache/james/mime4j/field/FieldParser.java
diff --git a/src/org/apache/james/mime4j/field/MailboxField.java b/emailcommon/src/org/apache/james/mime4j/field/MailboxField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/MailboxField.java
rename to emailcommon/src/org/apache/james/mime4j/field/MailboxField.java
diff --git a/src/org/apache/james/mime4j/field/MailboxListField.java b/emailcommon/src/org/apache/james/mime4j/field/MailboxListField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/MailboxListField.java
rename to emailcommon/src/org/apache/james/mime4j/field/MailboxListField.java
diff --git a/src/org/apache/james/mime4j/field/UnstructuredField.java b/emailcommon/src/org/apache/james/mime4j/field/UnstructuredField.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/UnstructuredField.java
rename to emailcommon/src/org/apache/james/mime4j/field/UnstructuredField.java
diff --git a/src/org/apache/james/mime4j/field/address/Address.java b/emailcommon/src/org/apache/james/mime4j/field/address/Address.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/Address.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/Address.java
diff --git a/src/org/apache/james/mime4j/field/address/AddressList.java b/emailcommon/src/org/apache/james/mime4j/field/address/AddressList.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/AddressList.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/AddressList.java
diff --git a/src/org/apache/james/mime4j/field/address/Builder.java b/emailcommon/src/org/apache/james/mime4j/field/address/Builder.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/Builder.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/Builder.java
diff --git a/src/org/apache/james/mime4j/field/address/DomainList.java b/emailcommon/src/org/apache/james/mime4j/field/address/DomainList.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/DomainList.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/DomainList.java
diff --git a/src/org/apache/james/mime4j/field/address/Group.java b/emailcommon/src/org/apache/james/mime4j/field/address/Group.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/Group.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/Group.java
diff --git a/src/org/apache/james/mime4j/field/address/Mailbox.java b/emailcommon/src/org/apache/james/mime4j/field/address/Mailbox.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/Mailbox.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/Mailbox.java
diff --git a/src/org/apache/james/mime4j/field/address/MailboxList.java b/emailcommon/src/org/apache/james/mime4j/field/address/MailboxList.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/MailboxList.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/MailboxList.java
diff --git a/src/org/apache/james/mime4j/field/address/NamedMailbox.java b/emailcommon/src/org/apache/james/mime4j/field/address/NamedMailbox.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/NamedMailbox.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/NamedMailbox.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTroute.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ASTroute.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj b/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/BaseNode.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/BaseNode.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/Node.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/Node.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/Node.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/Node.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/ParseException.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/ParseException.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/ParseException.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/ParseException.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/Token.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/Token.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/Token.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/Token.java
diff --git a/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java b/emailcommon/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
rename to emailcommon/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/Token.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/Token.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java b/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
rename to emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
diff --git a/src/org/apache/james/mime4j/field/datetime/DateTime.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/DateTime.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/DateTime.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/DateTime.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/Token.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/Token.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/Token.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/Token.java
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java b/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
similarity index 100%
rename from src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
rename to emailcommon/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
diff --git a/src/org/apache/james/mime4j/message/AbstractBody.java b/emailcommon/src/org/apache/james/mime4j/message/AbstractBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/AbstractBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/AbstractBody.java
diff --git a/src/org/apache/james/mime4j/message/BinaryBody.java b/emailcommon/src/org/apache/james/mime4j/message/BinaryBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/BinaryBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/BinaryBody.java
diff --git a/src/org/apache/james/mime4j/message/Body.java b/emailcommon/src/org/apache/james/mime4j/message/Body.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/Body.java
rename to emailcommon/src/org/apache/james/mime4j/message/Body.java
diff --git a/src/org/apache/james/mime4j/message/BodyPart.java b/emailcommon/src/org/apache/james/mime4j/message/BodyPart.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/BodyPart.java
rename to emailcommon/src/org/apache/james/mime4j/message/BodyPart.java
diff --git a/src/org/apache/james/mime4j/message/Entity.java b/emailcommon/src/org/apache/james/mime4j/message/Entity.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/Entity.java
rename to emailcommon/src/org/apache/james/mime4j/message/Entity.java
diff --git a/src/org/apache/james/mime4j/message/Header.java b/emailcommon/src/org/apache/james/mime4j/message/Header.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/Header.java
rename to emailcommon/src/org/apache/james/mime4j/message/Header.java
diff --git a/src/org/apache/james/mime4j/message/MemoryBinaryBody.java b/emailcommon/src/org/apache/james/mime4j/message/MemoryBinaryBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/MemoryBinaryBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/MemoryBinaryBody.java
diff --git a/src/org/apache/james/mime4j/message/MemoryTextBody.java b/emailcommon/src/org/apache/james/mime4j/message/MemoryTextBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/MemoryTextBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/MemoryTextBody.java
diff --git a/src/org/apache/james/mime4j/message/Message.java b/emailcommon/src/org/apache/james/mime4j/message/Message.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/Message.java
rename to emailcommon/src/org/apache/james/mime4j/message/Message.java
diff --git a/src/org/apache/james/mime4j/message/Multipart.java b/emailcommon/src/org/apache/james/mime4j/message/Multipart.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/Multipart.java
rename to emailcommon/src/org/apache/james/mime4j/message/Multipart.java
diff --git a/src/org/apache/james/mime4j/message/TempFileBinaryBody.java b/emailcommon/src/org/apache/james/mime4j/message/TempFileBinaryBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/TempFileBinaryBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/TempFileBinaryBody.java
diff --git a/src/org/apache/james/mime4j/message/TempFileTextBody.java b/emailcommon/src/org/apache/james/mime4j/message/TempFileTextBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/TempFileTextBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/TempFileTextBody.java
diff --git a/src/org/apache/james/mime4j/message/TextBody.java b/emailcommon/src/org/apache/james/mime4j/message/TextBody.java
similarity index 100%
rename from src/org/apache/james/mime4j/message/TextBody.java
rename to emailcommon/src/org/apache/james/mime4j/message/TextBody.java
diff --git a/src/org/apache/james/mime4j/util/CharsetUtil.java b/emailcommon/src/org/apache/james/mime4j/util/CharsetUtil.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/CharsetUtil.java
rename to emailcommon/src/org/apache/james/mime4j/util/CharsetUtil.java
diff --git a/src/org/apache/james/mime4j/util/PartialInputStream.java b/emailcommon/src/org/apache/james/mime4j/util/PartialInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/PartialInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/util/PartialInputStream.java
diff --git a/src/org/apache/james/mime4j/util/PositionInputStream.java b/emailcommon/src/org/apache/james/mime4j/util/PositionInputStream.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/PositionInputStream.java
rename to emailcommon/src/org/apache/james/mime4j/util/PositionInputStream.java
diff --git a/src/org/apache/james/mime4j/util/SimpleTempStorage.java b/emailcommon/src/org/apache/james/mime4j/util/SimpleTempStorage.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/SimpleTempStorage.java
rename to emailcommon/src/org/apache/james/mime4j/util/SimpleTempStorage.java
diff --git a/src/org/apache/james/mime4j/util/TempFile.java b/emailcommon/src/org/apache/james/mime4j/util/TempFile.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/TempFile.java
rename to emailcommon/src/org/apache/james/mime4j/util/TempFile.java
diff --git a/src/org/apache/james/mime4j/util/TempPath.java b/emailcommon/src/org/apache/james/mime4j/util/TempPath.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/TempPath.java
rename to emailcommon/src/org/apache/james/mime4j/util/TempPath.java
diff --git a/src/org/apache/james/mime4j/util/TempStorage.java b/emailcommon/src/org/apache/james/mime4j/util/TempStorage.java
similarity index 100%
rename from src/org/apache/james/mime4j/util/TempStorage.java
rename to emailcommon/src/org/apache/james/mime4j/util/TempStorage.java