Consider removing the data dir and replacing with flattened structure

[kmcelwee]

In our new repo, the whole repo is the dataset, so maybe an explicit data directory isn't necessary

[kmcelwee]

This'll break too much, and this isn't necessarily cleaner.