Updated Makefile to included new files