Arranged Makefile.