[util] Refactor to accommodate for upcoming new tool
5 files changed