Activity Service refactoring
Merging 3 activity service classes into 1