refactored build.xml