Updated Makefile to reflect new directory structure