diff --git a/code-gen/build.xml b/code-gen/build.xml
index 3298102479d..89b262f552d 100644
--- a/code-gen/build.xml
+++ b/code-gen/build.xml
@@ -26,7 +26,7 @@
         <delete>
           <fileset  dir="${outputPath}"  includes="*.java"/>
         </delete>
-        <java classname="com.wordnik.codegen.java.JavaLibCodeGen">
+        <java classname="com.wordnik.codegen.config.java.JavaLibCodeGen">
             <classpath>
                   <pathelement location="build/main/java" />
                   <fileset dir="lib">
diff --git a/code-gen/src/main/java/com/wordnik/codegen/java/JavaCodeGenConfig.java b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenConfig.java
similarity index 97%
rename from code-gen/src/main/java/com/wordnik/codegen/java/JavaCodeGenConfig.java
rename to code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenConfig.java
index c07d2eca78f..dd9b40db551 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/java/JavaCodeGenConfig.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenConfig.java
@@ -1,4 +1,4 @@
-package com.wordnik.codegen.java;
+package com.wordnik.codegen.config.java;
 
 import com.wordnik.codegen.config.CodeGenConfig;
 
diff --git a/code-gen/src/main/java/com/wordnik/codegen/java/JavaCodeGenPverridingRules.java b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenPverridingRules.java
similarity index 97%
rename from code-gen/src/main/java/com/wordnik/codegen/java/JavaCodeGenPverridingRules.java
rename to code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenPverridingRules.java
index d0cd0b89093..ced727a7687 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/java/JavaCodeGenPverridingRules.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenPverridingRules.java
@@ -1,4 +1,4 @@
-package com.wordnik.codegen.java;
+package com.wordnik.codegen.config.java;
 
 import com.wordnik.codegen.config.CodeGenOverridingRules;
 
diff --git a/code-gen/src/main/java/com/wordnik/codegen/java/JavaDataTypeMapper.java b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaDataTypeMapper.java
similarity index 99%
rename from code-gen/src/main/java/com/wordnik/codegen/java/JavaDataTypeMapper.java
rename to code-gen/src/main/java/com/wordnik/codegen/config/java/JavaDataTypeMapper.java
index 8cfaa4c1547..8cd16d75a84 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/java/JavaDataTypeMapper.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaDataTypeMapper.java
@@ -1,4 +1,4 @@
-package com.wordnik.codegen.java;
+package com.wordnik.codegen.config.java;
 
 import com.wordnik.codegen.config.DataTypeMapper;
 import com.wordnik.codegen.config.ServiceAndMethodNameGenerator;
diff --git a/code-gen/src/main/java/com/wordnik/codegen/java/JavaGenEnvConfig.java b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaGenEnvConfig.java
similarity index 94%
rename from code-gen/src/main/java/com/wordnik/codegen/java/JavaGenEnvConfig.java
rename to code-gen/src/main/java/com/wordnik/codegen/config/java/JavaGenEnvConfig.java
index c41cf771495..a39df16a98b 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/java/JavaGenEnvConfig.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaGenEnvConfig.java
@@ -1,4 +1,4 @@
-package com.wordnik.codegen.java;
+package com.wordnik.codegen.config.java;
 
 import com.wordnik.codegen.config.GenerationEnvironmentConfig;
 import com.wordnik.exception.CodeGenerationException;
diff --git a/code-gen/src/main/java/com/wordnik/codegen/java/JavaLibCodeGen.java b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaLibCodeGen.java
similarity index 95%
rename from code-gen/src/main/java/com/wordnik/codegen/java/JavaLibCodeGen.java
rename to code-gen/src/main/java/com/wordnik/codegen/config/java/JavaLibCodeGen.java
index d74e3c38a35..afb00cd1cd8 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/java/JavaLibCodeGen.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaLibCodeGen.java
@@ -1,4 +1,4 @@
-package com.wordnik.codegen.java;
+package com.wordnik.codegen.config.java;
 
 import com.wordnik.codegen.DriverCodeGenerator;
 import com.wordnik.exception.CodeGenerationException;
diff --git a/code-gen/src/main/java/com/wordnik/codegen/java/JavaServiceAndMethodNameGenerator.java b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaServiceAndMethodNameGenerator.java
similarity index 99%
rename from code-gen/src/main/java/com/wordnik/codegen/java/JavaServiceAndMethodNameGenerator.java
rename to code-gen/src/main/java/com/wordnik/codegen/config/java/JavaServiceAndMethodNameGenerator.java
index 26ede1ebba9..1643a9c2d18 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/java/JavaServiceAndMethodNameGenerator.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/config/java/JavaServiceAndMethodNameGenerator.java
@@ -1,4 +1,4 @@
-package com.wordnik.codegen.java;
+package com.wordnik.codegen.config.java;
 
 import com.wordnik.codegen.resource.Model;
 import com.wordnik.codegen.config.ServiceAndMethodNameGenerator;
diff --git a/java/src/test/java/com/wordnik/test/APITestRunner.java b/java/src/test/java/com/wordnik/test/APITestRunner.java
index 03cf79fd327..703f05f0692 100644
--- a/java/src/test/java/com/wordnik/test/APITestRunner.java
+++ b/java/src/test/java/com/wordnik/test/APITestRunner.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.wordnik.codegen.config.CodeGenConfig;
-import com.wordnik.codegen.java.JavaCodeGenConfig;
+import com.wordnik.codegen.config.java.JavaCodeGenConfig;
 import com.wordnik.common.*;
 import com.wordnik.exception.APIException;
 import org.apache.commons.beanutils.MethodUtils;
@@ -17,7 +17,6 @@ import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.DeserializationConfig.Feature;
 
 import com.wordnik.api.WordAPI;
-import com.wordnik.codegen.resource.Resource;
 import com.wordnik.model.TestData;
 import org.codehaus.jackson.map.SerializationConfig;
 import org.codehaus.jackson.map.type.TypeFactory;
diff --git a/java/src/test/java/com/wordnik/test/TestCaseExecutor.java b/java/src/test/java/com/wordnik/test/TestCaseExecutor.java
index 67154b5033e..74cf0c2890d 100644
--- a/java/src/test/java/com/wordnik/test/TestCaseExecutor.java
+++ b/java/src/test/java/com/wordnik/test/TestCaseExecutor.java
@@ -2,10 +2,8 @@ package com.wordnik.test;
 
 import com.wordnik.annotations.MethodArgumentNames;
 import com.wordnik.api.WordAPI;
-import com.wordnik.codegen.DriverCodeGenerator;
 import com.wordnik.codegen.config.CodeGenConfig;
-import com.wordnik.codegen.java.JavaCodeGenConfig;
-import com.wordnik.codegen.resource.Resource;
+import com.wordnik.codegen.config.java.JavaCodeGenConfig;
 import com.wordnik.exception.APIException;
 import com.wordnik.exception.APIExceptionCodes;
 import org.apache.commons.beanutils.BeanUtils;