move some data classes from DATA (closes #3497)
Merge pull request #606 from Eric-Brison/3.2-I3497

move some data classes from DATA (closes #3497)