Reorganize Ant buildfile