refactor persistence setup wizard
refactor scaffold setup wizard, fix problem with persistence setup wizard