Ant buildfiles
Refactor