diff --git a/build/exportScripts/KeyStreamServer.xml b/build/exportScripts/KeyStreamServer.xml
index e239a04..e03338a 100644
--- a/build/exportScripts/KeyStreamServer.xml
+++ b/build/exportScripts/KeyStreamServer.xml
@@ -10,25 +10,6 @@
             </manifest>
             <fileset dir="../../java/core/bin"/>
             <fileset dir="../../java/ext/bouncycastle/bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/annotations-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/el-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper-el.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jsp-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/servlet-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
             <fileset dir="../../java/ext/jordanzimmerman/bin"/>
             <fileset dir="../../java/ext/json/bin"/>
             <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>
diff --git a/build/exportScripts/MailStreamServer.xml b/build/exportScripts/MailStreamServer.xml
index 374549c..9521a1f 100644
--- a/build/exportScripts/MailStreamServer.xml
+++ b/build/exportScripts/MailStreamServer.xml
@@ -10,25 +10,6 @@
             </manifest>
             <fileset dir="../../java/core/bin"/>
             <fileset dir="../../java/ext/bouncycastle/bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/annotations-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/el-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper-el.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jsp-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/servlet-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
             <fileset dir="../../java/ext/jordanzimmerman/bin"/>
             <fileset dir="../../java/ext/json/bin"/>
             <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>
diff --git a/build/exportScripts/PostfixMailReceiver.xml b/build/exportScripts/PostfixMailReceiver.xml
index fc99c7e..c2b9ad8 100644
--- a/build/exportScripts/PostfixMailReceiver.xml
+++ b/build/exportScripts/PostfixMailReceiver.xml
@@ -10,25 +10,6 @@
             </manifest>
             <fileset dir="../../java/core/bin"/>
             <fileset dir="../../java/ext/bc-packaged/bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/annotations-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina-ant.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina-ha.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina-tribes.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/ecj-4.2.1.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/el-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/jasper-el.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/jasper.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/jsp-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/servlet-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-coyote.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-dbcp.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-es.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-fr.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-ja.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-jdbc.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-util.jar"/>
             <fileset dir="../../java/ext/jordanzimmerman/bin"/>
             <fileset dir="../../java/ext/json/bin"/>
             <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>
diff --git a/build/exportScripts/Tools.xml b/build/exportScripts/Tools.xml
index 51a9319..26acd03 100644
--- a/build/exportScripts/Tools.xml
+++ b/build/exportScripts/Tools.xml
@@ -11,25 +11,6 @@
             <fileset dir="../../java/app/tools/bin"/>
             <fileset dir="../../java/core/bin"/>
             <fileset dir="../../java/ext/bouncycastle/bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/annotations-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/el-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper-el.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jsp-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/servlet-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
             <fileset dir="../../java/ext/jordanzimmerman/bin"/>
             <fileset dir="../../java/ext/json/bin"/>
             <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>
diff --git a/ext/.gitignore b/ext/.gitignore
index b500841..241e560 100644
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -1,3 +1,2 @@
-*.tar.gz
-*.zip
+*
 
diff --git a/java/app/tools/build.xml b/java/app/tools/build.xml
index 7ebe759..37b7ed5 100644
--- a/java/app/tools/build.xml
+++ b/java/app/tools/build.xml
@@ -8,7 +8,7 @@
     <property environment="env"/>
     <property name="ECLIPSE_HOME" value="../../../../../Desktop/eclipse"/>
     <property name="Mailiverse.Ext.Apache.location" value="../../ext/apache"/>
-    <property name="Mailiverse.Ext.BouncyCastle.location" value="../../ext/lcrypto-jdk15on-148"/>
+    <property name="Mailiverse.Ext.BouncyCastle.location" value="../../ext/bouncycastle"/>
     <property name="Mailiverse.Ext.JordanZimmerman.location" value="../../ext/jordanzimmerman"/>
     <property name="Mailiverse.Ext.Json.location" value="../../ext/json"/>
     <property name="Mailiverse.Core.location" value="../../core"/>
@@ -17,25 +17,25 @@
     <property name="source" value="1.6"/>
     <path id="EAR Libraries.libraryclasspath"/>
     <path id="Apache Tomcat v7.0 [Apache Tomcat v7.0].libraryclasspath">
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/annotations-api.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina-ant.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina-ha.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina-tribes.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/ecj-4.2.1.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/el-api.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/jasper-el.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/jasper.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/jsp-api.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/servlet-api.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-api.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-coyote.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-dbcp.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-es.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-fr.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-ja.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-jdbc.jar"/>
-        <pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-util.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/annotations-api.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/catalina-ant.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/catalina-ha.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/catalina.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/el-api.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/jasper-el.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/jasper.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/jsp-api.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/servlet-api.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-api.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
+        <pathelement location="../../../ext/apache-tomcat/lib/tomcat-util.jar"/>
     </path>
     <path id="Mailiverse.Ext.BouncyCastle.classpath">
         <pathelement location="${Mailiverse.Ext.BouncyCastle.location}/bin"/>
diff --git a/java/build-java-projects b/java/build-java-projects
index 096ae67..b65091f 100755
--- a/java/build-java-projects
+++ b/java/build-java-projects
@@ -1,3 +1,7 @@
+pushd app/tools
+ant clean && ant
+popd
+
 pushd core
 ant clean && ant
 popd