remove upstream in prep for submodule
add submodule
update Makefile
2.0.0.0-3