improved Makefile layout.