Cleaned up the API namespace in preparation for documentation.