restructured files for ant