Update Kiosk apps to new structure