Organize

Begin organizing the wizard code into classes.