Cleaned up the folder, updated the Makefile, and updated the README