Further Debug reorg