Reorganize for ant build