Changing Schemas to match new data model, and updating references in the...

... relevant files.