Moved JSON helpers into helper package