CMS-1239 Honing of Content Data classes
Moved typed Data wrappers into Data as inner classes.