Updated Makefile for new dir structure.