Rearranging the API