Updating app structure to make life easier