build.xml 'refactoring'