Fixed build.xml to work with changes to folder structure