Moved utils to different package