Reorganized make files.