Reorganize Makefile slightly.