capifony and small build.xml refactor
capifony and small build.xml refactor