Some refactoring in build.xml