Have you ever organized your content structure the way that page related data sources are residing under the page (or under a folder within the page)?