splitting out into server and client modules - part 2 (correcting to use java 7 in build)