refactor to move utils into util package
new util packagE
merge up changes