Updated data frameworks

Added 2015 proposed data structure as well for discussion and review.
Potentially looking to model application on future data structure now,
rather than update later.