move some data classes in CORE (closes #3496)