Update the Makefile for the new structure.