More reorg and annotation