diff --git a/apps/desktopgui/.classpath b/apps/desktopgui/.classpath
index 18abb1c6c39452be7831a372903095499c50b410..0053a208d4a4637948a50f7e56e32b6aacf5db82 100644
--- a/apps/desktopgui/.classpath
+++ b/apps/desktopgui/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/apps/routerconsole/java/.classpath b/apps/routerconsole/.classpath
similarity index 76%
rename from apps/routerconsole/java/.classpath
rename to apps/routerconsole/.classpath
index dfa60eff268249d41eac7307185d0d605d63c4e6..581759fecbf16a9636152298ae6977e375036631 100644
--- a/apps/routerconsole/java/.classpath
+++ b/apps/routerconsole/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="java/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"/>
@@ -8,6 +8,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jrobin"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/systray"/>
-	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
-	<classpathentry kind="output" path="build/obj"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
+	<classpathentry kind="output" path="java/build/obj"/>
 </classpath>
diff --git a/apps/routerconsole/java/.project b/apps/routerconsole/.project
similarity index 100%
rename from apps/routerconsole/java/.project
rename to apps/routerconsole/.project
diff --git a/apps/susidns/src/.classpath b/apps/susidns/src/.classpath
index 4847bccb339401381999e9922ab6cb17af370386..b80c2ccf3da21bb1c439db16644eee802254cd54 100644
--- a/apps/susidns/src/.classpath
+++ b/apps/susidns/src/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="java/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/jstl.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/standard.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jstl.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/standard.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>
diff --git a/installer/.classpath b/installer/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..5caf4124f41680a5492715edfa9b50392afdb180
--- /dev/null
+++ b/installer/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<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 exported="true" kind="lib" path="lib/wrapper/all/wrapper.jar"/>
+	<classpathentry kind="output" path="java/build"/>
+</classpath>
diff --git a/installer/.project b/installer/.project
new file mode 100644
index 0000000000000000000000000000000000000000..4aee79a57590336c0b7924d3701b6b801213ca18
--- /dev/null
+++ b/installer/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>installer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/installer/lib/.project b/installer/lib/.project
deleted file mode 100644
index 14aa1aa45c1b5dc1c3ad14ea9e55c630ca530a34..0000000000000000000000000000000000000000
--- a/installer/lib/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>lib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>