Review: Just a slight reorg.