Wizard package reorganization
automerge: 566425b

* commit '566425bcf8176128d85cf4deadcaefe68cac45e1':
  Wizard package reorganization