Break the dep from util -> api

Part 1 in a series of changes towards data validation