Rearrangements related to new figure on types and classes.