refactor: simplify services code files