diff --git a/apps/i2psnark/.classpath b/apps/i2psnark/.classpath
index f82d4d002..8ebb72d80 100644
--- a/apps/i2psnark/.classpath
+++ b/apps/i2psnark/.classpath
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="java/src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-util.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/org.mortbay.jetty.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
 	<classpathentry kind="output" path="java/build/obj"/>
 </classpath>
diff --git a/apps/jetty/.classpath b/apps/jetty/.classpath
index e53376d8c..3de618644 100644
--- a/apps/jetty/.classpath
+++ b/apps/jetty/.classpath
@@ -3,11 +3,27 @@
 	<classpathentry kind="src" path="java/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="lib" path="jettylib/javax.servlet.jar"/>
-	<classpathentry kind="lib" path="jettylib/jetty-http.jar"/>
-	<classpathentry kind="lib" path="jettylib/jetty-io.jar"/>
-	<classpathentry kind="lib" path="jettylib/jetty-util.jar"/>
-	<classpathentry kind="lib" path="jettylib/jetty-xml.jar"/>
-	<classpathentry kind="lib" path="jettylib/org.mortbay.jetty.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/commons-el.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/commons-logging.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jasper-compiler.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jasper-runtime.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/javax.servlet.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-continuation.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-deploy.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-http.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-i2p.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-io.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-java5-threadpool.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-rewrite-handler.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-security.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-servlet.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-servlets.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-sslengine.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-start.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-webapp.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/jetty-xml.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/org.mortbay.jetty.jar"/>
+	<classpathentry exported="true" kind="lib" path="jettylib/org.mortbay.jmx.jar"/>
 	<classpathentry kind="output" path="build/obj"/>
 </classpath>
diff --git a/apps/jrobin/.classpath b/apps/jrobin/.classpath
index 9913a9dfe..e9a4c4d69 100644
--- a/apps/jrobin/.classpath
+++ b/apps/jrobin/.classpath
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="jrobin-1.5.9.1.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/apps/routerconsole/java/.classpath b/apps/routerconsole/java/.classpath
index 70d7a0756..dfa60eff2 100644
--- a/apps/routerconsole/java/.classpath
+++ b/apps/routerconsole/java/.classpath
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/desktopgui"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jrobin"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/systray"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-http.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-java5-threadpool.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-security.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-servlet.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-sslengine.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-util.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-webapp.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/org.mortbay.jetty.jar"/>
-	<classpathentry kind="lib" path="/jrobin/jrobin-1.5.9.1.jar"/>
 	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
 	<classpathentry kind="output" path="build/obj"/>
 </classpath>
diff --git a/apps/susimail/.classpath b/apps/susimail/.classpath
index 298429060..11a25c971 100644
--- a/apps/susimail/.classpath
+++ b/apps/susimail/.classpath
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-util.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/org.mortbay.jetty.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
 	<classpathentry kind="output" path="src/WEB-INF/classes"/>
 </classpath>