CMS-2078 Let ContentType be persisted as an Node

Some cleanup