Cleaned up makefile to fit new directory structure.