remove upstream in preparation for submodule
add module
update makefile to use correct version