Rename utils package to billing
Refactor out to helper classes