remove upstream in prep for submodule
add submodule
add Makefile changes