[REF] Moved utility classes to Util