Adding AddOn/Discount/Plan/Subscription; Quite a bit of refactoring;