Refactoring Payments and Subscription modules