Refactor around the serviceScope module.