BuildDataset->DatasetBuilder

Also reformatted some of the raw data