NEXT: Organize data

Reordering data for consistency with similar files in other parts of the repo