changed organization and brought in a few new pieces for new disjoint+ooojava