Updated makefile for new file structure.