Rename files and fix up Makefile