Messed up
Revert "Messed up"

This reverts commit 6c7caae3b70c47f4b48575460045e9f449bc0019.
Trying again to restructure data model
Solidified data model into one model.  Controllers have been changed to use it.