CMS-1161 Align FormItem classes with the structure of Content Data classes