Remove method package and add Util class