Retructured data providers using module pattern.