Restructed Makefile.