Changed filenames and Makefile to match current project.