Util(s): move to consistent packages