Seperate ANT concepts into own files
Rename files more explicit