diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index a7833441b..805edd6b1 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="systray">
     <target name="all" depends="clean, build" />
-    <target name="build" depends="jar" />
+    <target name="build" depends="builddep, jar" />
+    <target name="builddep">
+        <ant dir="../../../core/java/" target="build" />
+    </target>
     <target name="compile">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
@@ -13,14 +16,14 @@
             target="1.3"
             destdir="./build/obj"
             includes="**/*.java"
-            classpath="./src/net/i2p/apps/systray/lib/systray4j.jar" />
+            classpath="./lib/systray4j.jar:../../../core/java/build/i2p.jar" />
     </target>
     <target name="jar" depends="compile">
         <copy todir="./build/lib">
-            <fileset dir="./src/net/i2p/apps/systray/lib" includes="libsystray4j.so systray4j.dll systray4j.jar" />
+            <fileset dir="./lib" includes="libsystray4j.so systray4j.dll systray4j.jar" />
         </copy>
         <copy todir="./build/icons">
-            <fileset dir="./src/net/i2p/apps/systray/icons" />
+            <fileset dir="./resources/" />
         </copy>
         <mkdir dir="./build/jar_temp" />
         <copy todir="./build/jar_temp">
@@ -39,7 +42,7 @@
         <mkdir dir="./build/javadoc" />
         <javadoc
             sourcepath="./src"
-            classpath="./src:./src/net/i2p/apps/systray/lib/systray4j.jar"
+            classpath="./src:./lib/systray4j.jar"
             destdir="./build/javadoc"
             packagenames="*"
             use="true"
diff --git a/apps/systray/java/src/net/i2p/apps/systray/i2psystray.bat b/apps/systray/java/i2psystray.bat
similarity index 100%
rename from apps/systray/java/src/net/i2p/apps/systray/i2psystray.bat
rename to apps/systray/java/i2psystray.bat
diff --git a/apps/systray/java/src/net/i2p/apps/systray/i2psystray.sh b/apps/systray/java/i2psystray.sh
similarity index 100%
rename from apps/systray/java/src/net/i2p/apps/systray/i2psystray.sh
rename to apps/systray/java/i2psystray.sh
diff --git a/apps/systray/java/src/net/i2p/apps/systray/lib/systray4j.dll b/apps/systray/java/lib/systray4j.dll
similarity index 100%
rename from apps/systray/java/src/net/i2p/apps/systray/lib/systray4j.dll
rename to apps/systray/java/lib/systray4j.dll
diff --git a/apps/systray/java/src/net/i2p/apps/systray/lib/systray4j.jar b/apps/systray/java/lib/systray4j.jar
similarity index 100%
rename from apps/systray/java/src/net/i2p/apps/systray/lib/systray4j.jar
rename to apps/systray/java/lib/systray4j.jar
diff --git a/apps/systray/java/src/net/i2p/apps/systray/icons/iggy.ico b/apps/systray/java/resources/iggy.ico
similarity index 100%
rename from apps/systray/java/src/net/i2p/apps/systray/icons/iggy.ico
rename to apps/systray/java/resources/iggy.ico
diff --git a/apps/systray/java/src/net/i2p/apps/systray/icons/iggy.xpm b/apps/systray/java/resources/iggy.xpm
similarity index 100%
rename from apps/systray/java/src/net/i2p/apps/systray/icons/iggy.xpm
rename to apps/systray/java/resources/iggy.xpm
diff --git a/apps/systray/java/src/net/i2p/apps/systray/lib/libsystray4j.so b/apps/systray/java/src/net/i2p/apps/systray/lib/libsystray4j.so
deleted file mode 100644
index 1c345c582..000000000
Binary files a/apps/systray/java/src/net/i2p/apps/systray/lib/libsystray4j.so and /dev/null differ