build.xml refactored again