Removed superfluous files, updated Makefile