Started refactoring services, todo: Path refactor