Further reorg moving add_reloc