Move the service Notification and Payment to namespace specific

New feature