Refactored new tax service to be in a different package.