split ify and rename DataSet to Dataset (as it should have been)