diff --git a/build/build.xml b/build/build.xml
index 1ca820e60..d593f01d7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -68,25 +68,25 @@
   <target name="subprojects-clean">
     <subant buildpath="../core" target="clean"/>
     <subant buildpath="../app" target="clean"/>
-    <subant buildpath="../dxf" target="clean"/>
-    <subant buildpath="../net" target="clean"/>
-    <subant buildpath="../opengl" target="clean"/>
-    <subant buildpath="../pdf" target="clean"/>
-    <subant buildpath="../serial" target="clean"/>
-    <subant buildpath="../video" target="clean"/>
-    <subant buildpath="../android" target="clean"/>
+    <subant buildpath="../java/libraries/dxf" target="clean"/>
+    <subant buildpath="../java/libraries/net" target="clean"/>
+    <subant buildpath="../java/libraries/opengl" target="clean"/>
+    <subant buildpath="../java/libraries/pdf" target="clean"/>
+    <subant buildpath="../java/libraries/serial" target="clean"/>
+    <subant buildpath="../java/libraries/video" target="clean"/>
+    <subant buildpath="../android/core" target="clean"/>
   </target>
   
   <target name="subprojects-build">
     <subant buildpath="../core" target="build"/>
     <subant buildpath="../app" target="build"/>
-    <subant buildpath="../dxf" target="build"/>
-    <subant buildpath="../net" target="build"/>
-    <subant buildpath="../opengl" target="build"/>
-    <subant buildpath="../pdf" target="build"/>
-    <subant buildpath="../serial" target="build"/>
-    <subant buildpath="../video" target="build"/>
-    <subant buildpath="../android" target="build"/>
+    <subant buildpath="../java/libraries/dxf" target="build"/>
+    <subant buildpath="../java/libraries/net" target="build"/>
+    <subant buildpath="../java/libraries/opengl" target="build"/>
+    <subant buildpath="../java/libraries/pdf" target="build"/>
+    <subant buildpath="../java/libraries/serial" target="build"/>
+    <subant buildpath="../java/libraries/video" target="build"/>
+    <subant buildpath="../android/core" target="build"/>
   </target>
   
 
@@ -102,14 +102,26 @@
     <copy todir="${target.path}/tools">
       <fileset dir="shared/tools" />
     </copy>
+
+    <copy todir="${target.path}/modes/java">
+      <fileset dir="../java">
+	<exclude name="**/bin/**" />
+	<exclude name="**/src/**" />
+	<exclude name="cmd" />
+	<exclude name="reference.zip" />
+	<exclude name="**/._*" />
+      </fileset>
+    </copy>
     
     <!-- copy libraries -->
+<!--
     <copy todir="${target.path}/modes/java/libraries">
       <fileset dir="../java/libraries">
 	<include name="**/library/**" />
 	<include name="**/src/**" />
       </fileset>
     </copy>
+-->
 
     <!-- copy shared library folder -->
 <!--
@@ -152,7 +164,7 @@
     </unzip>
 -->
     <unzip dest="${target.path}/modes/java" 
-	   src="shared/modes/java/reference.zip" 
+	   src="../java/reference.zip" 
 	   overwrite="false">
       <patternset>
 	<exclude name="__MACOSX/**" />
diff --git a/java/libraries/dxf/build.xml b/java/libraries/dxf/build.xml
index 3de8ab6c7..a0be1ea50 100644
--- a/java/libraries/dxf/build.xml
+++ b/java/libraries/dxf/build.xml
@@ -7,17 +7,19 @@
   </target>
   
   <target name="compile" description="Compile sources">
+    <echo message="${runtime.jars}" />
+
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../../../core/core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/core.jar" />
     
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar" />
+	   classpath="../../../core/core.jar" />
   </target>
   
   <target name="build" depends="compile" description="Build DXF library">
diff --git a/java/libraries/net/build.xml b/java/libraries/net/build.xml
index 803dd8e4f..56b1812f5 100644
--- a/java/libraries/net/build.xml
+++ b/java/libraries/net/build.xml
@@ -8,16 +8,16 @@
 
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../../../core/core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/core.jar" />
     
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar" />
+	   classpath="../../../core/core.jar" />
   </target>
 
   <target name="build" depends="compile" description="Build net library">
diff --git a/java/libraries/opengl/build.xml b/java/libraries/opengl/build.xml
index 910cd8b45..fa708e66f 100644
--- a/java/libraries/opengl/build.xml
+++ b/java/libraries/opengl/build.xml
@@ -8,16 +8,16 @@
   
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../../../core/core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/core.jar" />
     
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar; library/jogl.jar" />
+	   classpath="../../../core/core.jar; library/jogl.jar" />
   </target>
 
   <target name="build" depends="compile" description="Build OpenGL library">
diff --git a/java/libraries/pdf/build.xml b/java/libraries/pdf/build.xml
index 18067b121..3cee27cd1 100644
--- a/java/libraries/pdf/build.xml
+++ b/java/libraries/pdf/build.xml
@@ -8,16 +8,16 @@
   
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../../../core/core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/core.jar" />
     
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar; library/itext.jar" />
+	   classpath="../../../core/core.jar; library/itext.jar" />
   </target>
   
   <target name="build" depends="compile" description="Build PDF library">
diff --git a/java/libraries/serial/build.xml b/java/libraries/serial/build.xml
index c893b1d9d..f85c1f749 100644
--- a/java/libraries/serial/build.xml
+++ b/java/libraries/serial/build.xml
@@ -8,16 +8,16 @@
 
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../../../core/core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/core.jar" />
 
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar; library/RXTXcomm.jar" />
+	   classpath="../../../core/core.jar; library/RXTXcomm.jar" />
   </target>
   
   <target name="build" depends="compile" description="Build serial library">
diff --git a/java/libraries/video/build.xml b/java/libraries/video/build.xml
index 5ff0693c9..4a7196504 100644
--- a/java/libraries/video/build.xml
+++ b/java/libraries/video/build.xml
@@ -8,16 +8,16 @@
   
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../../../core/core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/core.jar" />
 
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar; QTJava.zip" />
+	   classpath="../../../core/core.jar; QTJava.zip" />
   </target>
   
   <target name="build" depends="compile" description="Build video library">