diff --git a/translator/Makefile b/translator/Makefile
index babceca3ec..aa943a6b8e 100644
--- a/translator/Makefile
+++ b/translator/Makefile
@@ -190,8 +190,11 @@ JAVA_SOURCES = \
 	javac/JavacParser.java \
 	javac/MemoryFileObject.java \
 	javac/TreeConverter.java \
+	jdt/AbstractBinding.java \
+	jdt/AbstractTypeBinding.java \
 	jdt/BindingConverter.java \
 	jdt/GeneratedMethodBinding.java \
+	jdt/GeneratedPackageBinding.java \
 	jdt/GeneratedTypeBinding.java \
 	jdt/GeneratedVariableBinding.java \
 	jdt/JdtAnnotationMirror.java \
@@ -262,15 +265,12 @@ JAVA_SOURCES = \
 	translate/UnsequencedExpressionRewriter.java \
 	translate/VarargsRewriter.java \
 	translate/VariableRenamer.java \
-	types/AbstractBinding.java \
-	types/AbstractTypeBinding.java \
 	types/AbstractTypeMirror.java \
 	types/ExecutablePair.java \
 	types/FunctionElement.java \
 	types/GeneratedArrayType.java \
 	types/GeneratedElement.java \
 	types/GeneratedExecutableElement.java \
-	types/GeneratedPackageBinding.java \
 	types/GeneratedPackageElement.java \
 	types/GeneratedTypeElement.java \
 	types/GeneratedVariableElement.java \
diff --git a/translator/src/main/java/com/google/devtools/j2objc/types/AbstractBinding.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/AbstractBinding.java
similarity index 97%
rename from translator/src/main/java/com/google/devtools/j2objc/types/AbstractBinding.java
rename to translator/src/main/java/com/google/devtools/j2objc/jdt/AbstractBinding.java
index c892f9c429..beddb175b5 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/types/AbstractBinding.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/AbstractBinding.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.j2objc.types;
+package com.google.devtools.j2objc.jdt;
 
 import com.google.common.collect.Lists;
 import java.util.Arrays;
diff --git a/translator/src/main/java/com/google/devtools/j2objc/types/AbstractTypeBinding.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/AbstractTypeBinding.java
similarity index 99%
rename from translator/src/main/java/com/google/devtools/j2objc/types/AbstractTypeBinding.java
rename to translator/src/main/java/com/google/devtools/j2objc/jdt/AbstractTypeBinding.java
index 16cff5d82b..6c89ae6497 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/types/AbstractTypeBinding.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/AbstractTypeBinding.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.j2objc.types;
+package com.google.devtools.j2objc.jdt;
 
 import org.eclipse.jdt.core.dom.IAnnotationBinding;
 import org.eclipse.jdt.core.dom.IBinding;
diff --git a/translator/src/main/java/com/google/devtools/j2objc/jdt/BindingConverter.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/BindingConverter.java
index 9da9c7bfea..f526ef3432 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/jdt/BindingConverter.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/BindingConverter.java
@@ -17,7 +17,6 @@
 import com.google.devtools.j2objc.types.AbstractTypeMirror;
 import com.google.devtools.j2objc.types.GeneratedElement;
 import com.google.devtools.j2objc.types.GeneratedExecutableElement;
-import com.google.devtools.j2objc.types.GeneratedPackageBinding;
 import com.google.devtools.j2objc.types.GeneratedPackageElement;
 import com.google.devtools.j2objc.types.GeneratedTypeElement;
 import com.google.devtools.j2objc.types.GeneratedVariableElement;
diff --git a/translator/src/main/java/com/google/devtools/j2objc/types/GeneratedPackageBinding.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedPackageBinding.java
similarity index 97%
rename from translator/src/main/java/com/google/devtools/j2objc/types/GeneratedPackageBinding.java
rename to translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedPackageBinding.java
index 507dbbb4f2..079d4486e9 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/types/GeneratedPackageBinding.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedPackageBinding.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.j2objc.types;
+package com.google.devtools.j2objc.jdt;
 
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IPackageBinding;
diff --git a/translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedTypeBinding.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedTypeBinding.java
index 30382f7a26..26cb21c731 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedTypeBinding.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/GeneratedTypeBinding.java
@@ -17,8 +17,6 @@
 package com.google.devtools.j2objc.jdt;
 
 import com.google.common.collect.Sets;
-import com.google.devtools.j2objc.types.AbstractTypeBinding;
-import com.google.devtools.j2objc.types.GeneratedPackageBinding;
 import com.google.devtools.j2objc.util.BindingUtil;
 import java.util.Set;
 import javax.lang.model.element.PackageElement;
diff --git a/translator/src/main/java/com/google/devtools/j2objc/jdt/JdtNullType.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/JdtNullType.java
index 6cd2d84dee..b675eaddd6 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/jdt/JdtNullType.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/JdtNullType.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.j2objc.jdt;
 
-import com.google.devtools.j2objc.types.AbstractTypeBinding;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.List;