move some data classes from DATA (closes #3497)