Added MakePretty and changed Jar output locations