refactor scaffold setup wizard, fix problem with persistence setup wizard