Make the API more solid and organized.