Initial split of internal and external api types.

nit: extra space at the start of this line