diff --git a/javascript/README b/javascript/README
index 3d3b23edb..2aa975135 100644
--- a/javascript/README
+++ b/javascript/README
@@ -33,7 +33,7 @@ project:
     have changed:
   a.  Manually update the .pb.js files with the changes of the .proto files.
   b.  Manually update the toJsArray() Java methods in
-      tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java
+      tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java
   c.  Build tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar
       by running:
       mvn -f tools/java/java-build/pom.xml package
diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java
similarity index 99%
rename from tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java
rename to tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java
index a1073095b..9ebe2ba59 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/BuildMetadataFromXml.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/Command.java b/tools/java/common/src/com/google/i18n/phonenumbers/Command.java
similarity index 97%
rename from tools/java/common/src/com/google/i18n/phonenumbers/tools/Command.java
rename to tools/java/common/src/com/google/i18n/phonenumbers/Command.java
index 414e2e291..b54ef7339 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/Command.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/Command.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 /**
  * Abstract class defining a common interface for commands provided by build tools (e.g: commands to
@@ -48,4 +48,4 @@ public abstract class Command {
   public void setArgs(String[] args) {
     this.args = args;
   }
-}
\ No newline at end of file
+}
diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/CommandDispatcher.java b/tools/java/common/src/com/google/i18n/phonenumbers/CommandDispatcher.java
similarity index 98%
rename from tools/java/common/src/com/google/i18n/phonenumbers/tools/CommandDispatcher.java
rename to tools/java/common/src/com/google/i18n/phonenumbers/CommandDispatcher.java
index 01d77fdcf..2806ba3ea 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/CommandDispatcher.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/CommandDispatcher.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 /**
  * This class is designed to execute a requested command among a set of provided commands.
diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java b/tools/java/common/src/com/google/i18n/phonenumbers/CopyrightNotice.java
similarity index 98%
rename from tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java
rename to tools/java/common/src/com/google/i18n/phonenumbers/CopyrightNotice.java
index cdac6e4b3..d8cd9e2f1 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/CopyrightNotice.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/CopyrightNotice.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/tools/FileUtils.java b/tools/java/common/src/com/google/i18n/phonenumbers/FileUtils.java
similarity index 97%
rename from tools/java/common/src/com/google/i18n/phonenumbers/tools/FileUtils.java
rename to tools/java/common/src/com/google/i18n/phonenumbers/FileUtils.java
index ccacfc2da..41a11eedd 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/tools/FileUtils.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/FileUtils.java
@@ -15,7 +15,7 @@
  *  under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java b/tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java
similarity index 99%
rename from tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java
rename to tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java
index b0dbec367..70944b617 100644
--- a/tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java
+++ b/tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
diff --git a/tools/java/cpp-build/pom.xml b/tools/java/cpp-build/pom.xml
index b271dcbac..fd8952a54 100644
--- a/tools/java/cpp-build/pom.xml
+++ b/tools/java/cpp-build/pom.xml
@@ -107,7 +107,7 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
-              <mainClass>com.google.i18n.phonenumbers.tools.EntryPoint</mainClass>
+              <mainClass>com.google.i18n.phonenumbers.EntryPoint</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java b/tools/java/cpp-build/src/com/google/i18n/phonenumbers/BuildMetadataCppFromXml.java
similarity index 99%
rename from tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java
rename to tools/java/cpp-build/src/com/google/i18n/phonenumbers/BuildMetadataCppFromXml.java
index cbd558883..ddc01e375 100644
--- a/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java
+++ b/tools/java/cpp-build/src/com/google/i18n/phonenumbers/BuildMetadataCppFromXml.java
@@ -14,9 +14,10 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
+
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/EntryPoint.java b/tools/java/cpp-build/src/com/google/i18n/phonenumbers/EntryPoint.java
similarity index 95%
rename from tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/EntryPoint.java
rename to tools/java/cpp-build/src/com/google/i18n/phonenumbers/EntryPoint.java
index 1c38e94ba..d08184d91 100644
--- a/tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/EntryPoint.java
+++ b/tools/java/cpp-build/src/com/google/i18n/phonenumbers/EntryPoint.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 /**
  * Entry point class for C++ build tools.
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 779034c03..03a113e25 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/cpp-build/test/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXmlTest.java b/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java
similarity index 97%
rename from tools/java/cpp-build/test/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXmlTest.java
rename to tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java
index ecfda462b..e1c5eed63 100644
--- a/tools/java/cpp-build/test/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXmlTest.java
+++ b/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/tools/java/data/pom.xml b/tools/java/data/pom.xml
index a643a65cb..c33215e11 100644
--- a/tools/java/data/pom.xml
+++ b/tools/java/data/pom.xml
@@ -69,7 +69,7 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
-              <mainClass>com.google.i18n.phonenumbers.tools.CombineGeoData</mainClass>
+              <mainClass>com.google.i18n.phonenumbers.CombineGeoData</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/tools/java/data/src/com/google/i18n/phonenumbers/tools/CombineGeoData.java b/tools/java/data/src/com/google/i18n/phonenumbers/CombineGeoData.java
similarity index 99%
rename from tools/java/data/src/com/google/i18n/phonenumbers/tools/CombineGeoData.java
rename to tools/java/data/src/com/google/i18n/phonenumbers/CombineGeoData.java
index 385a3f463..0e2fe7c90 100644
--- a/tools/java/data/src/com/google/i18n/phonenumbers/tools/CombineGeoData.java
+++ b/tools/java/data/src/com/google/i18n/phonenumbers/CombineGeoData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
diff --git a/tools/java/data/src/com/google/i18n/phonenumbers/tools/CombineGeoDataServlet.java b/tools/java/data/src/com/google/i18n/phonenumbers/CombineGeoDataServlet.java
similarity index 97%
rename from tools/java/data/src/com/google/i18n/phonenumbers/tools/CombineGeoDataServlet.java
rename to tools/java/data/src/com/google/i18n/phonenumbers/CombineGeoDataServlet.java
index 0011beb68..6a5889065 100644
--- a/tools/java/data/src/com/google/i18n/phonenumbers/tools/CombineGeoDataServlet.java
+++ b/tools/java/data/src/com/google/i18n/phonenumbers/CombineGeoDataServlet.java
@@ -16,7 +16,7 @@
  * @author Philippe Liard
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/tools/java/data/test/com/google/i18n/phonenumbers/tools/CombineGeoDataTest.java b/tools/java/data/test/com/google/i18n/phonenumbers/CombineGeoDataTest.java
similarity index 98%
rename from tools/java/data/test/com/google/i18n/phonenumbers/tools/CombineGeoDataTest.java
rename to tools/java/data/test/com/google/i18n/phonenumbers/CombineGeoDataTest.java
index c6b1fea3f..58aa9dee9 100644
--- a/tools/java/data/test/com/google/i18n/phonenumbers/tools/CombineGeoDataTest.java
+++ b/tools/java/data/test/com/google/i18n/phonenumbers/CombineGeoDataTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.google.i18n.phonenumbers.tools.CombineGeoData.Range;
+import com.google.i18n.phonenumbers.CombineGeoData.Range;
 
 import org.junit.Test;
 
diff --git a/tools/java/data/webapp/WEB-INF/web.xml b/tools/java/data/webapp/WEB-INF/web.xml
index c30d720ae..911a1c264 100644
--- a/tools/java/data/webapp/WEB-INF/web.xml
+++ b/tools/java/data/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
   http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
   <servlet>
     <servlet-name>CombineGeoDataServlet</servlet-name>
-    <servlet-class>com.google.i18n.phonenumbers.tools.CombineGeoDataServlet</servlet-class>
+    <servlet-class>com.google.i18n.phonenumbers.CombineGeoDataServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>CombineGeoDataServlet</servlet-name>
diff --git a/tools/java/java-build/pom.xml b/tools/java/java-build/pom.xml
index 6ce4268f4..e09ce6627 100644
--- a/tools/java/java-build/pom.xml
+++ b/tools/java/java-build/pom.xml
@@ -84,7 +84,7 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
-              <mainClass>com.google.i18n.phonenumbers.tools.EntryPoint</mainClass>
+              <mainClass>com.google.i18n.phonenumbers.EntryPoint</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java
similarity index 99%
rename from tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java
rename to tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java
index ea5908b50..248ac796e 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataJsonFromXml.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
similarity index 99%
rename from tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java
rename to tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
index eba97ac6b..094a892ab 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataProtoFromXml.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/EntryPoint.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/EntryPoint.java
similarity index 90%
rename from tools/java/java-build/src/com/google/i18n/phonenumbers/tools/EntryPoint.java
rename to tools/java/java-build/src/com/google/i18n/phonenumbers/EntryPoint.java
index 3649571f3..fb3a0b1f8 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/EntryPoint.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/EntryPoint.java
@@ -14,7 +14,9 @@
  *  limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
+
+import com.google.i18n.phonenumbers.geocoding.GenerateAreaCodeData;
 
 /**
  * Entry point class for Java and JavaScript build tools.
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/JSArrayBuilder.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/JSArrayBuilder.java
similarity index 98%
rename from tools/java/java-build/src/com/google/i18n/phonenumbers/tools/JSArrayBuilder.java
rename to tools/java/java-build/src/com/google/i18n/phonenumbers/JSArrayBuilder.java
index cdc5326d6..ba8c64554 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/JSArrayBuilder.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/JSArrayBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers;
 
 import java.util.Iterator;
 
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/geocoding/GenerateAreaCodeData.java
similarity index 99%
rename from tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java
rename to tools/java/java-build/src/com/google/i18n/phonenumbers/geocoding/GenerateAreaCodeData.java
index 5d164e01d..7170c604b 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/tools/GenerateAreaCodeData.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/geocoding/GenerateAreaCodeData.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers.geocoding;
 
-import com.google.i18n.phonenumbers.geocoding.AreaCodeMap;
-import com.google.i18n.phonenumbers.geocoding.MappingFileProvider;
+import com.google.i18n.phonenumbers.Command;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
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 2f7279d08..45296a8b4 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/java/java-build/test/com/google/i18n/phonenumbers/tools/GenerateAreaCodeDataTest.java b/tools/java/java-build/test/com/google/i18n/phonenumbers/geocoding/GenerateAreaCodeDataTest.java
similarity index 97%
rename from tools/java/java-build/test/com/google/i18n/phonenumbers/tools/GenerateAreaCodeDataTest.java
rename to tools/java/java-build/test/com/google/i18n/phonenumbers/geocoding/GenerateAreaCodeDataTest.java
index 807afe8c5..5c7d880ac 100644
--- a/tools/java/java-build/test/com/google/i18n/phonenumbers/tools/GenerateAreaCodeDataTest.java
+++ b/tools/java/java-build/test/com/google/i18n/phonenumbers/geocoding/GenerateAreaCodeDataTest.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.i18n.phonenumbers.tools;
+package com.google.i18n.phonenumbers.geocoding;
 
-import com.google.i18n.phonenumbers.geocoding.AreaCodeMap;
-import com.google.i18n.phonenumbers.geocoding.MappingFileProvider;
-import com.google.i18n.phonenumbers.tools.GenerateAreaCodeData.AreaCodeMappingHandler;
+import com.google.i18n.phonenumbers.geocoding.GenerateAreaCodeData.AreaCodeMappingHandler;
 
 import junit.framework.TestCase;