Move xml classes to  data package