Modified makefile to work with new directory structure.