restructuring so that we can build uberjars
Merge branch '2.0-maint' into 2.1-maint
cleanup
Merge branch '2.0-maint' into 2.1-maint