Reorg make files