Revert "Data model changes"
Merge pull request #53 from ContinuumIO/revert-51-data_model

Revert "Data model changes"