build.xml refactored