Change provider package
Move scope annotations and Add provider listener support