refactor billing settings for better namespacing