Fixups to schema, beginning to split things out into definitions