Moved everything to one content provider