Moved util module into main package
moved util into the main package