Updated Makefile and added Header files