Adjust makefile to reflect new layout