File ervice refactor