Removed old files, changed Makefile