Some refactoring of build.xml