Pull classes into top level types.