Organize the endpoints