Updated makefile, file names and readme