More re-organization of the API