Services Refactored

Services relevant to Activities refactored to be handled by the activity