Reorganized and improved makefile.