Updated Makefile with new cpps etc.