Return Wizard classes

This reverts commit 4848b5fb2b4ff00a3d94002d1f0653cd91623c9e.