move some classes into a new 'data' package