Bring app to core code state using new structure