diff --git a/debian/libphonenumber-java.jlibs b/debian/libphonenumber-java.jlibs index 04e6faa04..6e8e63d3d 100644 --- a/debian/libphonenumber-java.jlibs +++ b/debian/libphonenumber-java.jlibs @@ -1 +1 @@ -java/build/jar/libphonenumber.jar +java/libphonenumber/build/jar/libphonenumber.jar diff --git a/debian/rules b/debian/rules index b067e8ed1..0c1a5fe97 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ JAVA_HOME ?= /usr/lib/jvm/default-java CMAKE_FLAGS := -DCMAKE_INSTALL_PREFIX=/usr CPP_BUILD := cpp/build -JAVA_BUILD := java/build +JAVA_BUILD := java/libphonenumber/build ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 diff --git a/java/build.xml b/java/libphonenumber/build.xml similarity index 77% rename from java/build.xml rename to java/libphonenumber/build.xml index bab47323e..172c2659a 100644 --- a/java/build.xml +++ b/java/libphonenumber/build.xml @@ -6,15 +6,19 @@ - + + + + - + @@ -24,9 +28,9 @@ - + - + @@ -36,9 +40,9 @@ - + - + @@ -48,9 +52,9 @@ - + - + @@ -58,9 +62,9 @@ - + - + @@ -68,25 +72,25 @@ - + - - + + - + - - + + - + - - + + diff --git a/java/pom.xml b/java/libphonenumber/pom.xml similarity index 60% rename from java/pom.xml rename to java/libphonenumber/pom.xml index 32cdd14ad..2a4a9ae9a 100644 --- a/java/pom.xml +++ b/java/libphonenumber/pom.xml @@ -191,93 +191,6 @@ - - - dev - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - - build-metadata - generate-sources - - exec - - - java - - -jar - ../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar - BuildMetadataProtoFromXml - ../resources/PhoneNumberMetaData.xml - src - false - false - - - - - build-test-metadata - generate-test-sources - - exec - - - java - - -jar - ../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar - BuildMetadataProtoFromXml - ../resources/PhoneNumberMetaDataForTesting.xml - test - true - false - - - - - build-geo-data - generate-sources - - exec - - - java - - -jar - ../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar - GenerateAreaCodeData - ../resources/geocoding - src/com/google/i18n/phonenumbers/geocoding/data - - - - - build-geo-test-data - generate-test-sources - - exec - - - java - - -jar - ../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar - GenerateAreaCodeData - ../resources/test/geocoding - test/com/google/i18n/phonenumbers/geocoding/testing_data - - - - - - - - diff --git a/java/release_notes.txt b/java/libphonenumber/release_notes.txt similarity index 100% rename from java/release_notes.txt rename to java/libphonenumber/release_notes.txt diff --git a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java diff --git a/java/src/com/google/i18n/phonenumbers/NumberParseException.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/NumberParseException.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java diff --git a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/Phonemetadata.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java diff --git a/java/src/com/google/i18n/phonenumbers/Phonenumber.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/Phonenumber.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/Phonenumber.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/Phonenumber.java diff --git a/java/src/com/google/i18n/phonenumbers/RegexCache.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/RegexCache.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/RegexCache.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/RegexCache.java diff --git a/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW similarity index 100% rename from java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1201_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1201_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1201_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1201_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1202_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1202_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1202_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1202_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1203_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1203_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1203_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1203_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1204_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1204_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1204_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1204_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1205_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1205_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1205_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1205_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1206_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1206_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1206_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1206_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1207_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1207_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1207_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1207_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1208_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1208_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1208_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1208_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1209_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1209_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1209_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1209_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1210_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1210_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1210_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1210_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1212_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1212_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1212_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1212_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1213_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1213_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1213_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1213_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1214_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1214_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1214_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1214_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1215_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1215_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1215_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1215_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1216_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1216_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1216_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1216_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1217_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1217_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1217_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1217_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1218_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1218_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1218_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1218_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1219_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1219_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1219_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1219_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1224_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1224_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1224_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1224_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1225_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1225_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1225_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1225_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1226_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1226_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1226_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1226_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1228_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1228_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1228_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1228_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1229_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1229_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1229_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1229_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1231_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1231_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1231_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1231_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1234_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1234_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1234_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1234_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1239_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1239_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1239_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1239_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1240_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1240_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1240_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1240_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1248_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1248_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1248_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1248_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1250_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1250_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1250_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1250_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1251_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1251_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1251_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1251_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1252_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1252_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1252_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1252_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1253_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1253_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1253_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1253_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1254_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1254_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1254_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1254_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1256_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1256_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1256_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1256_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1260_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1260_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1260_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1260_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1262_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1262_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1262_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1262_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1267_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1267_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1267_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1267_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1269_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1269_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1269_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1269_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1270_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1270_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1270_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1270_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1276_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1276_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1276_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1276_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1281_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1281_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1281_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1281_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1289_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1289_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1289_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1289_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1301_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1301_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1301_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1301_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1302_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1302_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1302_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1302_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1303_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1303_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1303_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1303_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1304_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1304_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1304_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1304_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1305_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1305_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1305_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1305_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1306_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1306_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1306_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1306_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1307_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1307_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1307_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1307_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1308_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1308_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1308_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1308_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1309_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1309_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1309_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1309_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1310_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1310_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1310_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1310_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1312_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1312_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1312_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1312_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1313_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1313_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1313_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1313_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1314_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1314_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1314_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1314_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1315_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1315_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1315_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1315_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1316_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1316_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1316_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1316_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1317_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1317_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1317_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1317_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1318_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1318_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1318_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1318_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1319_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1319_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1319_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1319_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1320_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1320_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1320_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1320_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1321_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1321_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1321_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1321_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1323_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1323_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1323_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1323_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1325_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1325_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1325_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1325_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1330_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1330_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1330_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1330_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1331_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1331_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1331_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1331_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1334_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1334_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1334_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1334_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1336_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1336_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1336_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1336_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1337_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1337_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1337_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1337_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1339_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1339_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1339_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1339_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1347_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1347_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1347_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1347_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1351_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1351_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1351_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1351_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1352_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1352_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1352_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1352_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1360_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1360_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1360_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1360_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1361_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1361_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1361_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1361_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1385_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1385_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1385_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1385_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1386_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1386_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1386_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1386_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1401_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1401_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1401_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1401_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1402_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1402_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1402_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1402_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1403_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1403_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1403_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1403_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1404_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1404_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1404_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1404_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1405_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1405_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1405_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1405_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1406_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1406_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1406_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1406_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1407_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1407_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1407_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1407_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1408_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1408_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1408_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1408_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1409_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1409_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1409_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1409_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1410_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1410_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1410_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1410_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1412_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1412_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1412_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1412_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1413_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1413_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1413_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1413_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1414_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1414_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1414_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1414_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1415_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1415_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1415_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1415_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1416_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1416_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1416_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1416_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1417_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1417_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1417_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1417_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1418_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1418_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1418_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1418_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1419_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1419_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1419_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1419_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1423_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1423_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1423_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1423_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1424_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1424_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1424_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1424_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1425_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1425_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1425_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1425_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1430_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1430_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1430_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1430_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1432_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1432_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1432_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1432_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1434_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1434_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1434_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1434_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1435_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1435_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1435_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1435_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1438_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1438_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1438_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1438_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1440_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1440_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1440_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1440_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1443_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1443_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1443_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1443_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1450_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1450_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1450_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1450_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1469_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1469_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1469_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1469_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1478_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1478_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1478_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1478_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1479_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1479_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1479_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1479_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1480_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1480_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1480_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1480_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1484_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1484_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1484_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1484_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1501_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1501_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1501_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1501_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1502_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1502_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1502_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1502_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1503_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1503_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1503_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1503_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1504_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1504_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1504_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1504_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1505_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1505_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1505_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1505_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1506_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1506_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1506_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1506_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1507_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1507_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1507_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1507_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1508_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1508_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1508_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1508_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1509_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1509_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1509_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1509_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1510_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1510_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1510_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1510_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1512_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1512_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1512_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1512_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1513_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1513_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1513_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1513_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1514_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1514_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1514_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1514_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1515_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1515_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1515_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1515_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1516_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1516_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1516_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1516_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1517_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1517_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1517_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1517_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1518_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1518_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1518_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1518_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1519_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1519_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1519_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1519_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1520_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1520_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1520_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1520_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1530_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1530_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1530_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1530_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1540_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1540_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1540_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1540_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1541_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1541_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1541_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1541_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1551_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1551_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1551_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1551_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1559_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1559_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1559_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1559_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1561_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1561_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1561_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1561_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1562_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1562_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1562_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1562_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1563_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1563_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1563_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1563_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1567_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1567_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1567_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1567_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1570_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1570_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1570_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1570_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1571_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1571_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1571_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1571_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1573_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1573_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1573_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1573_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1574_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1574_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1574_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1574_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1575_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1575_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1575_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1575_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1580_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1580_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1580_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1580_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1585_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1585_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1585_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1585_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1586_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1586_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1586_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1586_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1587_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1587_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1587_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1587_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1601_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1601_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1601_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1601_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1602_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1602_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1602_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1602_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1603_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1603_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1603_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1603_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1604_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1604_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1604_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1604_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1605_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1605_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1605_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1605_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1606_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1606_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1606_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1606_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1607_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1607_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1607_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1607_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1608_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1608_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1608_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1608_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1609_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1609_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1609_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1609_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1610_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1610_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1610_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1610_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1612_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1612_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1612_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1612_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1613_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1613_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1613_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1613_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1614_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1614_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1614_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1614_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1615_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1615_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1615_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1615_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1616_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1616_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1616_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1616_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1617_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1617_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1617_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1617_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1618_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1618_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1618_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1618_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1619_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1619_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1619_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1619_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1620_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1620_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1620_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1620_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1623_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1623_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1623_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1623_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1626_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1626_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1626_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1626_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1630_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1630_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1630_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1630_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1631_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1631_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1631_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1631_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1636_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1636_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1636_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1636_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1641_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1641_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1641_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1641_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1646_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1646_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1646_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1646_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1647_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1647_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1647_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1647_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1650_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1650_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1650_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1650_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1651_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1651_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1651_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1651_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1657_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1657_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1657_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1657_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1660_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1660_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1660_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1660_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1661_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1661_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1661_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1661_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1662_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1662_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1662_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1662_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1678_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1678_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1678_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1678_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1682_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1682_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1682_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1682_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1701_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1701_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1701_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1701_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1702_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1702_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1702_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1702_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1703_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1703_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1703_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1703_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1704_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1704_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1704_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1704_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1705_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1705_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1705_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1705_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1706_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1706_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1706_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1706_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1707_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1707_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1707_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1707_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1708_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1708_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1708_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1708_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1709_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1709_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1709_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1709_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1712_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1712_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1712_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1712_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1713_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1713_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1713_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1713_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1714_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1714_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1714_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1714_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1715_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1715_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1715_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1715_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1716_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1716_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1716_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1716_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1717_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1717_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1717_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1717_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1718_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1718_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1718_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1718_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1719_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1719_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1719_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1719_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1720_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1720_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1720_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1720_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1724_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1724_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1724_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1724_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1726_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1726_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1726_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1726_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1727_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1727_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1727_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1727_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1730_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1730_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1730_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1730_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1731_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1731_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1731_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1731_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1732_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1732_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1732_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1732_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1734_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1734_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1734_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1734_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1740_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1740_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1740_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1740_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1754_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1754_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1754_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1754_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1757_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1757_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1757_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1757_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1760_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1760_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1760_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1760_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1763_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1763_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1763_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1763_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1765_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1765_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1765_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1765_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1769_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1769_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1769_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1769_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1770_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1770_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1770_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1770_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1772_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1772_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1772_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1772_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1773_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1773_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1773_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1773_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1774_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1774_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1774_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1774_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1775_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1775_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1775_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1775_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1778_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1778_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1778_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1778_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1779_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1779_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1779_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1779_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1780_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1780_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1780_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1780_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1781_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1781_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1781_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1781_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1785_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1785_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1785_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1785_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1786_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1786_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1786_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1786_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1801_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1801_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1801_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1801_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1802_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1802_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1802_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1802_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1803_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1803_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1803_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1803_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1804_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1804_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1804_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1804_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1805_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1805_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1805_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1805_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1806_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1806_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1806_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1806_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1807_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1807_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1807_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1807_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1808_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1808_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1808_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1808_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1810_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1810_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1810_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1810_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1812_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1812_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1812_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1812_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1813_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1813_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1813_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1813_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1814_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1814_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1814_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1814_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1815_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1815_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1815_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1815_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1816_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1816_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1816_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1816_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1817_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1817_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1817_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1817_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1818_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1818_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1818_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1818_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1819_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1819_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1819_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1819_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1828_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1828_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1828_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1828_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1830_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1830_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1830_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1830_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1831_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1831_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1831_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1831_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1832_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1832_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1832_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1832_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1838_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1838_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1838_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1838_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1843_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1843_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1843_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1843_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1845_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1845_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1845_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1845_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1847_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1847_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1847_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1847_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1848_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1848_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1848_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1848_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1850_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1850_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1850_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1850_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1851_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1851_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1851_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1851_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1856_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1856_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1856_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1856_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1857_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1857_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1857_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1857_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1858_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1858_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1858_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1858_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1859_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1859_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1859_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1859_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1860_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1860_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1860_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1860_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1862_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1862_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1862_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1862_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1863_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1863_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1863_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1863_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1864_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1864_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1864_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1864_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1865_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1865_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1865_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1865_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1867_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1867_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1867_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1867_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1870_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1870_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1870_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1870_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1872_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1872_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1872_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1872_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1878_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1878_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1878_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1878_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1888_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1888_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1888_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1888_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1901_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1901_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1901_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1901_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1902_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1902_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1902_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1902_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1903_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1903_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1903_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1903_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1904_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1904_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1904_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1904_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1905_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1905_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1905_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1905_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1906_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1906_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1906_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1906_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1907_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1907_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1907_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1907_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1908_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1908_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1908_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1908_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1909_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1909_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1909_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1909_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1910_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1910_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1910_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1910_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1912_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1912_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1912_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1912_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1913_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1913_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1913_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1913_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1914_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1914_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1914_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1914_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1915_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1915_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1915_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1915_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1916_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1916_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1916_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1916_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1917_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1917_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1917_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1917_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1918_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1918_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1918_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1918_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1919_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1919_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1919_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1919_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1920_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1920_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1920_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1920_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1925_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1925_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1925_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1925_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1928_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1928_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1928_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1928_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1931_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1931_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1931_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1931_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1936_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1936_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1936_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1936_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1937_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1937_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1937_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1937_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1940_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1940_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1940_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1940_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1941_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1941_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1941_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1941_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1947_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1947_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1947_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1947_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1949_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1949_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1949_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1949_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1951_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1951_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1951_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1951_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1952_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1952_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1952_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1952_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1954_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1954_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1954_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1954_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1956_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1956_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1956_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1956_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1970_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1970_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1970_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1970_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1971_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1971_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1971_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1971_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1972_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1972_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1972_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1972_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1973_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1973_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1973_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1973_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1978_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1978_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1978_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1978_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1979_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1979_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1979_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1979_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1980_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1980_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1980_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1980_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1985_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1985_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1985_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1985_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1989_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1989_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/1989_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1989_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/20_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/20_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/20_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/20_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/212_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/212_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/212_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/213_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/213_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/213_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/213_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/216_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/216_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/216_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/216_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/220_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/220_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/220_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/220_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/221_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/221_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/221_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/221_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/222_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/222_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/222_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/222_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/224_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/224_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/224_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/224_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/225_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/225_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/225_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/225_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/226_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/226_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/226_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/226_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/228_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_es similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/228_es rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_es diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/228_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/229_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/229_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/229_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/229_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/230_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_es similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/230_es rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_es diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/232_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/232_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/232_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/232_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/233_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/233_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/233_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/233_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/238_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/238_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/238_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/238_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/239_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/242_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/243_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/243_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/243_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/243_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/244_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/244_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/244_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/244_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/245_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/245_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/245_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/245_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/247_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/247_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/247_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/247_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/249_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/249_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/249_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/249_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/251_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/251_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/251_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/252_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/252_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/252_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/252_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/254_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/254_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/254_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/254_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/256_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/256_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/256_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/256_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/258_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/258_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/258_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/258_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/260_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/260_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/260_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/260_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/261_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/261_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/261_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/261_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/263_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/263_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/263_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/263_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/264_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/264_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/264_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/264_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/266_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/266_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/266_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/266_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/267_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/267_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/267_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/267_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/268_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/268_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/268_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/268_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/269_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/269_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/27_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/27_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/27_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/27_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/290_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/299_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/299_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/299_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/299_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/30_el b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_el similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/30_el rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_el diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/30_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/30_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/31_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/31_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/31_nl b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_nl similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/31_nl rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_nl diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/33_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/33_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/33_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/33_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/34_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/34_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/34_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_es similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/34_es rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_es diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/351_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/351_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/351_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/351_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/352_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_de similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/352_de rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_de diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/352_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/352_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/354_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/354_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/354_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/354_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/355_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/355_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/355_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/355_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/358_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_fi b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_fi similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/358_fi rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_fi diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_se b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_se similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/358_se rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_se diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/36_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/36_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/36_hu b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_hu similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/36_hu rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_hu diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/370_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/370_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/370_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/370_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/371_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/371_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/371_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/371_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/372_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/372_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/372_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/372_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/373_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_ro b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ro similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/373_ro rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ro diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_ru b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ru similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/373_ru rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ru diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/374_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/374_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/374_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/374_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/381_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/381_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/381_sr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_sr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/381_sr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_sr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/39_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/39_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/39_it b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_it similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/39_it rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_it diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_de similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/41_de rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_de diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/41_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_fr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/41_fr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_fr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_it b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_it similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/41_it rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_it diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/420_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/420_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/420_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/420_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/421_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/421_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/421_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/421_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/43_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_de similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/43_de rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_de diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/43_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/43_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/44_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/44_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/44_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/46_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/46_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/46_sv b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_sv similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/46_sv rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_sv diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/48_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/48_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/48_pl b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_pl similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/48_pl rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_pl diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/49_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_de similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/49_de rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_de diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/49_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/49_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/51_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/51_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/51_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/51_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/53_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/53_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/53_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/53_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/54_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/54_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/54_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_es similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/54_es rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_es diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/55_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/55_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_pt similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/55_pt rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_pt diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/56_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_es similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/56_es rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_es diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/58_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/58_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/58_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_es similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/58_es rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_es diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/7_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/7_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/7_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/7_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/81_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/81_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/81_ja b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_ja similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/81_ja rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_ja diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/82_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_ko b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_ko similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/82_ko rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_ko diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/84_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/84_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/84_vi b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_vi similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/84_vi rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_vi diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/86_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_zh similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/86_zh rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_zh diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/886_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/90_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/90_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/90_tr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_tr similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/90_tr rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_tr diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/94_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/94_en similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/94_en rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/94_en diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/config similarity index 100% rename from java/src/com/google/i18n/phonenumbers/geocoding/data/config rename to java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/config diff --git a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java diff --git a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java diff --git a/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java diff --git a/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhonenumberTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/PhonenumberTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/PhonenumberTest.java diff --git a/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/RegexCacheTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/RegexCacheTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/RegexCacheTest.java diff --git a/java/test/com/google/i18n/phonenumbers/RegionCode.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/RegionCode.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/RegionCode.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/RegionCode.java diff --git a/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java.orig b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java.orig new file mode 100644 index 000000000..b1ae29b85 --- /dev/null +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java.orig @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2011 The Libphonenumber Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.i18n.phonenumbers; + +import junit.framework.TestCase; + +import java.io.InputStream; + +/** + * @author Shaopeng Jia + */ +public class ShortNumberUtilTest extends TestCase { + private ShortNumberUtil shortUtil; + static final String TEST_META_DATA_FILE_PREFIX = + "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting"; + + public ShortNumberUtilTest() { + PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance( + TEST_META_DATA_FILE_PREFIX, + CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap()); + shortUtil = new ShortNumberUtil(phoneUtil); + } + + public void testConnectsToEmergencyNumber_US() { + assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.US)); + assertTrue(shortUtil.connectsToEmergencyNumber("119", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.US)); + } + + public void testConnectsToEmergencyNumberLongNumber_US() { + assertTrue(shortUtil.connectsToEmergencyNumber("9116666666", RegionCode.US)); + assertTrue(shortUtil.connectsToEmergencyNumber("1196666666", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber("9996666666", RegionCode.US)); + } + + public void testConnectsToEmergencyNumberWithFormatting_US() { + assertTrue(shortUtil.connectsToEmergencyNumber("9-1-1", RegionCode.US)); + assertTrue(shortUtil.connectsToEmergencyNumber("1-1-9", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber("9-9-9", RegionCode.US)); + } + + public void testConnectsToEmergencyNumberWithPlusSign_US() { + assertFalse(shortUtil.connectsToEmergencyNumber("+911", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber("\uFF0B911", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber(" +911", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber("+119", RegionCode.US)); + assertFalse(shortUtil.connectsToEmergencyNumber("+999", RegionCode.US)); + } + + public void testConnectsToEmergencyNumber_BR() { + assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.BR)); + assertTrue(shortUtil.connectsToEmergencyNumber("190", RegionCode.BR)); + assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.BR)); + } + + public void testConnectsToEmergencyNumberLongNumber_BR() { + // Brazilian emergency numbers don't work when additional digits are appended. + assertFalse(shortUtil.connectsToEmergencyNumber("9111", RegionCode.BR)); + assertFalse(shortUtil.connectsToEmergencyNumber("1900", RegionCode.BR)); + assertFalse(shortUtil.connectsToEmergencyNumber("9996", RegionCode.BR)); + } +} diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT similarity index 100% rename from java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/config b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/config similarity index 100% rename from java/test/com/google/i18n/phonenumbers/geocoding/testing_data/config rename to java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/config diff --git a/javascript/README b/javascript/README index e59e36847..0996c6fbb 100644 --- a/javascript/README +++ b/javascript/README @@ -43,7 +43,7 @@ project: run the following commands to regenerate metadata.js and metadatafortesting.js: - ant -f java/build.xml build-js-metadata + ant -f java/libphonenumber/build.xml build-js-metadata 3. Manually port any changes of the Java code to the JavaScript code: PhoneNumberUtil.java => phonenumberutil.js diff --git a/tools/java/common/pom.xml b/tools/java/common/pom.xml index b91b96f4a..57502f3b4 100644 --- a/tools/java/common/pom.xml +++ b/tools/java/common/pom.xml @@ -27,7 +27,7 @@ 1.5 - org.codehaus.mojo @@ -42,7 +42,7 @@ - ../../../java/src/ + ../../../java/libphonenumber/src/ diff --git a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar index c9e004f3c..589151223 100644 Binary files a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ diff --git a/tools/java/java-build/pom.xml b/tools/java/java-build/pom.xml index e09ce6627..24d707a0d 100644 --- a/tools/java/java-build/pom.xml +++ b/tools/java/java-build/pom.xml @@ -21,7 +21,7 @@ - ${project.dir}/../../../../java/src/ + ${project.dir}/../../../../java/libphonenumber/src/ @@ -49,7 +49,7 @@ 1.5 - org.codehaus.mojo @@ -64,7 +64,7 @@ - ../../../java/src/ + ../../../java/libphonenumber/src/ ../common/src/ diff --git a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar index 41ca62da2..a6e6087bc 100644 Binary files a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ diff --git a/tools/script/continuous-integration.sh b/tools/script/continuous-integration.sh index 0fb674186..41e766d4d 100755 --- a/tools/script/continuous-integration.sh +++ b/tools/script/continuous-integration.sh @@ -81,10 +81,10 @@ test_cpp_version '-DUSE_RE2=ON' test_cpp_version '-DUSE_STD_MAP=ON' # Test Java version using Ant. -(cd java && ant clean jar && ant junit) || exit $? +(cd java/libphonenumber && ant clean jar && ant junit) || exit $? # Test Java version using Maven. -(cd java && mvn clean package) || exit $? +(cd java/libphonenumber && mvn clean package) || exit $? # Test build tools. (cd tools/java && mvn clean package) || exit $?