Restructure content fetching