Updated Makefile for new arrangement