Reworked the content model and separated content from the page, renaming...

... of the PageModel object remains