Improved Ant buildfile