Modified the schemas in accordance with the design document.
Merge branch 'master' of https://github.com/afruth/testfund