Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 16002)
+++ trunk/build.xml	(revision 16006)
@@ -51,5 +51,5 @@
         <property name="script-build.dir" location="${base.dir}/build2"/>
         <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
-        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
+        <property name="epsg.output" location="${base.dir}/resources/data/projection/custom-epsg"/>
         <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
@@ -97,4 +97,5 @@
             </fileset>
             <pathelement path="${build.dir}"/>
+            <pathelement path="${base.dir}/resources"/>
             <pathelement path="${failureaccess.jar}"/>
             <pathelement path="${guava.jar}"/>
@@ -187,6 +188,6 @@
     -->
     <target name="check-schemas" unless="check-schemas.notRequired" depends="init-properties">
-        <schemavalidate file="data/defaultpresets.xml" >
-            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
+        <schemavalidate file="resources/data/defaultpresets.xml" >
+            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="resources/data/tagging-preset.xsd" />
         </schemavalidate>
     </target>
@@ -215,7 +216,4 @@
             </manifest>
             <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
-            <zipfileset dir="images" prefix="images"/>
-            <zipfileset dir="data" prefix="data"/>
-            <zipfileset dir="styles" prefix="styles"/>
             <zipfileset dir="${src.dir}/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/>
         </jar>
@@ -494,5 +492,5 @@
         </sequential>
     </macrodef>
-    <target name="test-compile" depends="test-init,compile">
+    <target name="test-compile" depends="test-init,compile,epsg">
         <call-javac testfamily="unit">
             <cp-elements>