--- a/java/.classpath	Mon Apr 22 16:38:57 2013 +0100
+++ b/java/.classpath	Mon Apr 22 23:54:52 2013 +0100
@@ -5,6 +5,5 @@
 	<classpathentry kind="lib" path="libs-src/junit-4.8.2-sources.jar"/>
 	<classpathentry kind="lib" path="libs/groovy-all-1.8.2.jar"/>
 	<classpathentry kind="lib" path="libs/junit4-4.8.2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="libjava-support/bin"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

--- a/java/build.xml	Mon Apr 22 16:38:57 2013 +0100
+++ b/java/build.xml	Mon Apr 22 23:54:52 2013 +0100
@@ -17,29 +17,29 @@
     <property name="target" value="1.6"/>
     <property name="source" value="1.6"/>
     <path id="stx.libjava.classpath">
-        <pathelement location="libjava-support/bin"/>
+        <pathelement location="bin"/>
         <pathelement location="libs-src/groovy-all-1.8.2-sources.jar"/>
         <pathelement location="libs-src/junit-4.8.2-sources.jar"/>
         <pathelement location="libs/groovy-all-1.8.2.jar"/>
         <pathelement location="libs/junit4-4.8.2.jar"/>
     </path>
     <target name="init">
-        <mkdir dir="libjava-support/bin"/>
-        <copy includeemptydirs="false" todir="libjava-support/bin">
+        <mkdir dir="bin"/>
+        <copy includeemptydirs="false" todir="bin">
             <fileset dir="src">
                 <exclude name="**/*.java"/>
             </fileset>
         </copy>
     </target>
     <target name="clean">
-        <delete dir="libjava-support/bin"/>
+        <delete dir="bin"/>
     </target>
     <target depends="clean" name="cleanall"/>
     <target depends="build-subprojects,build-project" name="build"/>
     <target name="build-subprojects"/>
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="libjava-support/bin" includeantruntime="false" source="${source}" target="${target}">
+        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
             <src path="src"/>
             <classpath refid="stx.libjava.classpath"/>
         </javac>