Updates per app wizard package re-org
Updates to match Selector changes in app wizards