Tidy up file structure in DataRepository
Update TrackRecord to new DataRepository API