Moving app setup stuff back into sdk