Moving java signatures to smaller sub sets, need to update Makefile