refactor util
change path accordingly