Refactoring. Moved wizard into separate library.