import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import org.mxchange.jcoreutils.Comparables;
+import org.mxchange.jcoreutils.comparable.Comparables;
import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jcountry.model.data.CountryData;
import org.mxchange.jcountry.model.utils.CountryUtils;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import org.mxchange.jcoreutils.Comparables;
+import org.mxchange.jcoreutils.comparable.Comparables;
import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jcountry.model.data.CountryData;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import org.mxchange.jcoreutils.Comparables;
-import org.mxchange.jcoreutils.SafeNumberUtils;
+import org.mxchange.jcoreutils.comparable.Comparables;
+import org.mxchange.jcoreutils.number.SafeNumberUtils;
import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider;
import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jphone.model.utils.MobileProviderUtils;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import org.apache.commons.lang3.StringUtils;
-import org.mxchange.jcoreutils.Comparables;
-import org.mxchange.jcoreutils.SafeNumberUtils;
+import org.mxchange.jcoreutils.comparable.Comparables;
+import org.mxchange.jcoreutils.number.SafeNumberUtils;
import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jcountry.model.data.CountryData;
import org.mxchange.jcountry.model.utils.CountryUtils;