Move the service Notification and Payment to namespace specific
Move files to Service folder