diff --git a/apps/BOB/.classpath b/apps/BOB/.classpath
deleted file mode 100644
index 52bf51f328..0000000000
--- a/apps/BOB/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
diff --git a/apps/BOB/.project b/apps/BOB/.project
deleted file mode 100644
index 59f25717f8..0000000000
--- a/apps/BOB/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BOB</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/apps/BOB/BOB.iml b/apps/BOB/BOB.iml
deleted file mode 100644
index bef2403a37..0000000000
--- a/apps/BOB/BOB.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="ministreaming" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/addressbook/.classpath b/apps/addressbook/.classpath
deleted file mode 100644
index 8e9af08300..0000000000
--- a/apps/addressbook/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="java/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="output" path="build"/>
-</classpath>
diff --git a/apps/addressbook/.project b/apps/addressbook/.project
deleted file mode 100644
index 4132fe9ac3..0000000000
--- a/apps/addressbook/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>addressbook</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/apps/addressbook/addressbook.iml b/apps/addressbook/addressbook.iml
deleted file mode 100644
index a054410f6c..0000000000
--- a/apps/addressbook/addressbook.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$" relative="/WEB-INF" />
-        </webroots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jettylib" level="project" />
-    <orderEntry type="module" module-name="core" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/desktopgui/.classpath b/apps/desktopgui/.classpath
deleted file mode 100644
index 0053a208d4..0000000000
--- a/apps/desktopgui/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<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/desktopgui/.project b/apps/desktopgui/.project
deleted file mode 100644
index 791ea5c23b..0000000000
--- a/apps/desktopgui/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>desktopgui</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/apps/desktopgui/desktopgui.iml b/apps/desktopgui/desktopgui.iml
deleted file mode 100644
index d6250593a8..0000000000
--- a/apps/desktopgui/desktopgui.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="router" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/i2psnark/.classpath b/apps/i2psnark/.classpath
deleted file mode 100644
index 8ebb72d80d..0000000000
--- a/apps/i2psnark/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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 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/i2psnark/.project b/apps/i2psnark/.project
deleted file mode 100644
index ee1ba7c85f..0000000000
--- a/apps/i2psnark/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>i2psnark</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/apps/i2psnark/i2psnark.iml b/apps/i2psnark/i2psnark.iml
deleted file mode 100644
index 94bbb72747..0000000000
--- a/apps/i2psnark/i2psnark.iml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$" relative="/WEB-INF" />
-        </webroots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jettylib" level="project" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="ministreaming" />
-    <orderEntry type="module" module-name="jetty" />
-    <orderEntry type="module" module-name="systray" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/i2ptunnel/i2ptunnel.iml b/apps/i2ptunnel/i2ptunnel.iml
deleted file mode 100644
index d60f56b706..0000000000
--- a/apps/i2ptunnel/i2ptunnel.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/jsp/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/jsp" relative="/WEB-INF" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/java/src" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/junit" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="ministreaming" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
-    <orderEntry type="library" name="jettylib" level="project" />
-    <orderEntry type="module" module-name="jetty" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/jetty/.classpath b/apps/jetty/.classpath
deleted file mode 100644
index 89c99e92fa..0000000000
--- a/apps/jetty/.classpath
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="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-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/jetty/.project b/apps/jetty/.project
deleted file mode 100644
index ab7ec3e306..0000000000
--- a/apps/jetty/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>jetty</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/jetty-makejar.launch</value>
-				</dictionary>
-				<dictionary>
-					<key>incclean</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/apps/jetty/jetty.iml b/apps/jetty/jetty.iml
deleted file mode 100644
index 520489b6d6..0000000000
--- a/apps/jetty/jetty.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jettylib" level="project" />
-    <orderEntry type="module" module-name="core" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/jrobin/.classpath b/apps/jrobin/.classpath
deleted file mode 100644
index e9a4c4d69d..0000000000
--- a/apps/jrobin/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/jrobin/.project b/apps/jrobin/.project
deleted file mode 100644
index b83cf5b689..0000000000
--- a/apps/jrobin/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>jrobin</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/apps/ministreaming/ministreaming.iml b/apps/ministreaming/ministreaming.iml
deleted file mode 100644
index 0c5c3f05f3..0000000000
--- a/apps/ministreaming/ministreaming.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/junit" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3" level="application" />
-    <orderEntry type="library" scope="TEST" name="org.mockito:mockito-core:2.0.54-beta" level="application" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/routerconsole/.classpath b/apps/routerconsole/.classpath
deleted file mode 100644
index 581759fecb..0000000000
--- a/apps/routerconsole/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="/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 combineaccessrules="false" kind="src" path="/installer"/>
-	<classpathentry kind="output" path="java/build/obj"/>
-</classpath>
diff --git a/apps/routerconsole/.project b/apps/routerconsole/.project
deleted file mode 100644
index 63f4e2f755..0000000000
--- a/apps/routerconsole/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>routerconsole</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/apps/routerconsole/routerconsole.iml b/apps/routerconsole/routerconsole.iml
deleted file mode 100644
index dc25d9de77..0000000000
--- a/apps/routerconsole/routerconsole.iml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/jsp/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/jsp" relative="/WEB-INF" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/java/src" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/scalatest" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="wrapper-win" level="project" />
-    <orderEntry type="library" name="jettylib" level="project" />
-    <orderEntry type="library" name="jrobin-1.5.9.1" level="project" />
-    <orderEntry type="library" name="wrapper" level="project" />
-    <orderEntry type="module" module-name="jetty" />
-    <orderEntry type="module" module-name="systray" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="router" />
-    <orderEntry type="module" module-name="installer" />
-    <orderEntry type="module" module-name="desktopgui" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/sam/sam.iml b/apps/sam/sam.iml
deleted file mode 100644
index dd854f26d2..0000000000
--- a/apps/sam/sam.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="ministreaming" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/streaming/streaming.iml b/apps/streaming/streaming.iml
deleted file mode 100644
index 4c192447ab..0000000000
--- a/apps/streaming/streaming.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/junit" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="ministreaming" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3" level="application" />
-    <orderEntry type="library" scope="TEST" name="org.mockito:mockito-core:2.0.54-beta" level="application" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/susidns/susidns.iml b/apps/susidns/susidns.iml
deleted file mode 100644
index c7494e41cd..0000000000
--- a/apps/susidns/susidns.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/susimail/.classpath b/apps/susimail/.classpath
deleted file mode 100644
index 11a25c971e..0000000000
--- a/apps/susimail/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/src"/>
-	<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 kind="output" path="src/WEB-INF/classes"/>
-</classpath>
diff --git a/apps/susimail/.project b/apps/susimail/.project
deleted file mode 100644
index bed2da86c3..0000000000
--- a/apps/susimail/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>susimail</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/apps/susimail/susimail.iml b/apps/susimail/susimail.iml
deleted file mode 100644
index 4b90a13f45..0000000000
--- a/apps/susimail/susimail.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jettylib" level="project" />
-    <orderEntry type="module" module-name="jetty" />
-    <orderEntry type="module" module-name="core" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/systray/systray.iml b/apps/systray/systray.iml
deleted file mode 100644
index 25b9b6bb20..0000000000
--- a/apps/systray/systray.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="systray4j" level="project" />
-    <orderEntry type="module" module-name="core" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/core.iml b/core/core.iml
deleted file mode 100644
index b5994e7fea..0000000000
--- a/core/core.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/junit" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/scalatest" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3" level="application" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/installer/.classpath b/installer/.classpath
deleted file mode 100644
index 5caf4124f4..0000000000
--- a/installer/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index 4aee79a575..0000000000
--- a/installer/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/installer.iml b/installer/installer.iml
deleted file mode 100644
index 94d03debb1..0000000000
--- a/installer/installer.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tools/java/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="module" module-name="router" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/router/router.iml b/router/router.iml
deleted file mode 100644
index 26f20a04b2..0000000000
--- a/router/router.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/java/test/junit" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="application" />
-  </component>
-</module>
\ No newline at end of file