Significant restructure to isolate internal components (record, collection, schema, etc)