remove utils package and refactor