Refactoring - moving content related items into a Content namespace in the Web
Ditto