Reformat entity_types.josn and add more types.