renamed and updated Makefile