Reorganize the Dataset structure.