Update data source to reflect new approach.

I have been thinking about the data structure and have made some changes to reflect this.