Updated Makefiles to fit new directory structure.