Changed to having the main makefile be in the top directory.