Reordered the nested data heirarchy.
Merge branch 'data'