fixed migration and reorganized wizards