Updated Makefile layout.