diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11Definition.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11Definition.java
index b144ac51..63e9e2ba 100644
--- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11Definition.java
+++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11Definition.java
@@ -20,7 +20,6 @@ import javax.xml.transform.Source;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
-import org.springframework.ws.wsdl.wsdl11.builder.Wsdl11DefinitionBuilder;
 
 /**
  * <code>Wsdl11Definition</code> that creates a WSDL definition at runtime, using a {@link Wsdl11DefinitionBuilder}. Can
@@ -28,7 +27,7 @@ import org.springframework.ws.wsdl.wsdl11.builder.Wsdl11DefinitionBuilder;
  * and <code>buildConcretePart</code> properties.
  *
  * @author Arjen Poutsma
- * @see #setBuilder(org.springframework.ws.wsdl.wsdl11.builder.Wsdl11DefinitionBuilder)
+ * @see #setBuilder(Wsdl11DefinitionBuilder)
  * @see #setBuildAbstractPart(boolean)
  * @see #setBuildConcretePart(boolean)
  */
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/Wsdl11DefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11DefinitionBuilder.java
similarity index 95%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/Wsdl11DefinitionBuilder.java
rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11DefinitionBuilder.java
index 2df8e540..c282628d 100644
--- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/Wsdl11DefinitionBuilder.java
+++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11DefinitionBuilder.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.wsdl.wsdl11.builder;
+package org.springframework.ws.wsdl.wsdl11;
 
 import org.springframework.ws.wsdl.WsdlDefinitionException;
-import org.springframework.ws.wsdl.wsdl11.Wsdl11Definition;
 
 /**
  * Defines the contract for classes that can create a {@link Wsdl11Definition} at runtime.
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java
index 9c1e6afe..48b677cc 100644
--- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java
+++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java
@@ -27,6 +27,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ws.wsdl.WsdlDefinitionException;
 import org.springframework.ws.wsdl.wsdl11.Wsdl11Definition;
+import org.springframework.ws.wsdl.wsdl11.Wsdl11DefinitionBuilder;
 import org.springframework.ws.wsdl.wsdl11.Wsdl4jDefinition;
 import org.springframework.ws.wsdl.wsdl11.Wsdl4jDefinitionException;
 
@@ -38,13 +39,19 @@ import org.springframework.ws.wsdl.wsdl11.Wsdl4jDefinitionException;
  */
 public abstract class AbstractWsdl4jDefinitionBuilder implements Wsdl11DefinitionBuilder {
 
-    /** Logger available to subclasses. */
+    /**
+     * Logger available to subclasses.
+     */
     protected final Log logger = LogFactory.getLog(getClass());
 
-    /** WSDL4J extension registry. Lazily created in <code>createExtension()</code>. */
+    /**
+     * WSDL4J extension registry. Lazily created in <code>createExtension()</code>.
+     */
     private ExtensionRegistry extensionRegistry;
 
-    /** The WSDL4J <code>Definition</code> created by <code>buildDefinition()</code>. */
+    /**
+     * The WSDL4J <code>Definition</code> created by <code>buildDefinition()</code>.
+     */
     private Definition definition;
 
     public final void buildDefinition() throws WsdlDefinitionException {
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java
index ba5e6525..787c0d49 100644
--- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java
+++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java
@@ -18,7 +18,6 @@ package org.springframework.ws.wsdl.wsdl11;
 
 import junit.framework.TestCase;
 import org.easymock.MockControl;
-import org.springframework.ws.wsdl.wsdl11.builder.Wsdl11DefinitionBuilder;
 
 public class DynamicWsdl11DefinitionTest extends TestCase {