Updated Makefile to use the new classes