Simplifying schema, moving schema related things around a bit