build.xml refactoring