Refactor Utils package