refactoring, moved wizard pages to their own package