(refactor) Updates schema and moves stub data to new files
Merge pull request #41 from aselbie/refactor/stubs

(refactor) Updates schema and moves stub data to new files