Updated Makefile to support new code layout