diff --git a/trunk/.classpath b/trunk/.classpath
index 2bdfedf3..0a7cb3c9 100644
--- a/trunk/.classpath
+++ b/trunk/.classpath
@@ -6,7 +6,6 @@
 	<classpathentry kind="lib" path="lib.common/evolute.jar" sourcepath="/evolute/src"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/jdo.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/jdom.jar"/>
-	<classpathentry kind="lib" path="web/lib/mailapi.jar"/>
 	<classpathentry kind="lib" path="lib.tools/servlet-api.jar"/>
 	<classpathentry kind="lib" path="web/lib/commons-email-1.0-dev.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/TableLayout.jar"/>
@@ -21,15 +20,12 @@
 	<classpathentry kind="lib" path="SIPRPSoft/lib/avalon-framework-4.2.0.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/batik.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/fop.jar"/>
-	<classpathentry kind="lib" path="SIPRPSoft/lib/gnu-regexp-1.1.4.jar"/>
-	<classpathentry kind="lib" path="SIPRPSoft/lib/kafenio.jar"/>
-	<classpathentry kind="lib" path="SIPRPSoft/lib/kafenio-config.jar"/>
-	<classpathentry kind="lib" path="SIPRPSoft/lib/kafenio-icons.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/cayenne-server-3.0M2.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/ashwood-1.1.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/commons-collections-3.1.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/commons-lang-2.1.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/commons-logging-1.1.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar"/>
+	<classpathentry kind="lib" path="lib.common/mailapi.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/trunk/SIPRPSoft/lib/gnu-regexp-1.1.4.jar b/trunk/SIPRPSoft/lib/gnu-regexp-1.1.4.jar
deleted file mode 100644
index c3c8770b..00000000
Binary files a/trunk/SIPRPSoft/lib/gnu-regexp-1.1.4.jar and /dev/null differ
diff --git a/trunk/SIPRPSoft/lib/kafenio-config.jar b/trunk/SIPRPSoft/lib/kafenio-config.jar
deleted file mode 100644
index 03c6af8c..00000000
Binary files a/trunk/SIPRPSoft/lib/kafenio-config.jar and /dev/null differ
diff --git a/trunk/SIPRPSoft/lib/kafenio-icons.jar b/trunk/SIPRPSoft/lib/kafenio-icons.jar
deleted file mode 100644
index fe9a2323..00000000
Binary files a/trunk/SIPRPSoft/lib/kafenio-icons.jar and /dev/null differ
diff --git a/trunk/SIPRPSoft/lib/kafenio.jar b/trunk/SIPRPSoft/lib/kafenio.jar
deleted file mode 100644
index aa8dd290..00000000
Binary files a/trunk/SIPRPSoft/lib/kafenio.jar and /dev/null differ
diff --git a/trunk/web/lib/mailapi.jar b/trunk/lib.common/mailapi.jar
similarity index 100%
rename from trunk/web/lib/mailapi.jar
rename to trunk/lib.common/mailapi.jar