Reorg of cpackgen files