Refactor utils into separate namespace