Modified makefile, changed filenames