Makefile reorganization.