Updated makefile and removed old makefile