change structure of DataSet class hierarchy