Reformatted Makefile to include everything