move some data classes in CORE (closes #3496)
Merge pull request #3 from Eric-Brison/3.2-A3496

move some data classes in CORE (closes #3496)