Update app structure and conent