Modified the package structure for util class.