Initial refactoring of the content model