Added new files for future classes, and changed Makefile