CMS-4400 Data V2 - Replace usage of old data classes with new
Moved classes in data2 to data