Package names are changed to better reflect intent of API.