moved everything
second half of move
cleanup
build jar file
Updates from Rachel's review