updated Makefile with new .cpp names