fixup! Split the wizard package for better readability.