wizard cleaning

More classes in wizard for importing from repo