Rework make files