Refactor Utils package
Solve conflict in pull request #321
Merge pull request #321 from owdqa/feature/OWD-33103-Refactor_Utils

Refactor Utils package