Moved billing to separate package