Reorg schema to reflect simple/object/array/reference field structures. Add reference type, remove entity level reference constraint