Move key gen wizard into new module