added/removed files, updated Makefile.