Additional updates to new OC-Gen vocab

Added more properties, provided more organization to classes, some
cleanup.