Moved methods around
Added an ant script so I can use it in jenkins testing