Move util class to other package