WIP: Refactor container and object schema

Schema only.  Models are unchanged and thus broken.