Refactor CMS into new provider model.