Initial split of internal and external api types.

nit: double . at the end