Some reshuffling in prep for Wizard docs.