Reorganized make files