Refactoring of the content providers
Refactoring content and label providers.