restructuring so that we can build uberjars
cleanup