reorg ast structure