ISSUE#83

Switch over to the new data model. Delete empty files. A little bit
of code cleanup.
Merge branch 'sprint-3' into ISSUE-83-new-data-model