Refactor module "surfer.services"