Wand reorg