total refactoring of content