Updated Makefile to make use of a make folder