Tore Christiansen

Reordering class hierarchy and definitions to conform with ISO 15926

This diff could not be displayed because it is too large.