CMS-980 Remove ContentData and replace with "root DataSet"
Some minor re-organising.