Renamed classes to match new spec. Also updated SBOL2 to have more sugar, and updated some examples.