Move APIUtil into the api.util package