Removed old Makefile; updated Makefile