Updated makefile for new code structure.