Fixed makefile to reflect directory changes