Update Makefile for new source organization.