* some reorg