Initial split of internal and external api types.