Initial merge for Payment System and User model

Initial merge for Payment System and User model