diff --git a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
index bd40fbfb..f673aab8 100644
--- a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
+++ b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
@@ -42,7 +42,7 @@ public class LdapTemplateLookupOpenLdapITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_Plain() {
@@ -134,7 +134,7 @@ public class LdapTemplateLookupOpenLdapITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_ContextMapper() {
diff --git a/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml b/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml
index 316e8826..cd74f83f 100644
--- a/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml
+++ b/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml
@@ -19,7 +19,7 @@
 		<property name="base" value="${base}" />
 		<property name="pooled" value="false" />
 		<property name="dirObjectFactory"
-			value="org.springframework.ldap.core.DefaultDirObjectFactory" />
+			value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
 	</bean>
 
 	<bean id="dataSource"
diff --git a/spring-ldap/src/itest/java/conf/ldapTemplateAcegiTestContext.xml b/spring-ldap/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
index c8e57f25..aceb0131 100644
--- a/spring-ldap/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
+++ b/spring-ldap/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
@@ -20,7 +20,7 @@
 				class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
 		</property>
 		<property name="dirObjectFactory"
-			value="org.springframework.ldap.core.DefaultDirObjectFactory" />
+			value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
 	</bean>
 
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/spring-ldap/src/itest/java/conf/ldapTemplateNoBaseSuffixTestContext.xml b/spring-ldap/src/itest/java/conf/ldapTemplateNoBaseSuffixTestContext.xml
index 20450325..cc9fe0c3 100644
--- a/spring-ldap/src/itest/java/conf/ldapTemplateNoBaseSuffixTestContext.xml
+++ b/spring-ldap/src/itest/java/conf/ldapTemplateNoBaseSuffixTestContext.xml
@@ -14,7 +14,7 @@
 		<property name="urls" value="${urls}" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/spring-ldap/src/itest/java/conf/ldapTemplateTestContext.xml b/spring-ldap/src/itest/java/conf/ldapTemplateTestContext.xml
index 99728b26..240c85d4 100644
--- a/spring-ldap/src/itest/java/conf/ldapTemplateTestContext.xml
+++ b/spring-ldap/src/itest/java/conf/ldapTemplateTestContext.xml
@@ -15,7 +15,7 @@
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="base" value="${base}" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml b/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
index fef551bf..ee31f80c 100644
--- a/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
+++ b/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
@@ -19,7 +19,7 @@
 		<property name="base" value="${base}" />
 		<property name="pooled" value="false" />
 		<property name="dirObjectFactory"
-			value="org.springframework.ldap.core.DefaultDirObjectFactory" />
+			value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
 	</bean>
 
 	<bean id="contextSource"
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapServerManager.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapServerManager.java
index 7513e319..d3eb8c71 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapServerManager.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapServerManager.java
@@ -34,8 +34,8 @@ import org.apache.directory.server.jndi.ServerContextFactory;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.DefaultDirObjectFactory;
 import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.core.support.DefaultDirObjectFactory;
 
 /**
  * Utility class to initialize the apache directory server for use in the
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateContextMapperITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
index 20d1e1ac..9115fcbd 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
@@ -37,7 +37,7 @@ public class LdapTemplateContextMapperITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testSearch_ContextMapper() {
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
index f0b6d70b..f2421702 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
@@ -41,7 +41,7 @@ public class LdapTemplateLookupITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_Plain() {
@@ -133,7 +133,7 @@ public class LdapTemplateLookupITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_ContextMapper() {
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
index 30ffd084..ea2ea86e 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
@@ -37,7 +37,7 @@ public class LdapTemplateNoBaseSuffixITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_Plain() {
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/ContextMapper.java b/spring-ldap/src/main/java/org/springframework/ldap/core/ContextMapper.java
index 7d13f0ab..ec325910 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/ContextMapper.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/ContextMapper.java
@@ -20,6 +20,8 @@ import javax.naming.Binding;
 import javax.naming.Name;
 import javax.naming.directory.SearchResult;
 
+import org.springframework.ldap.core.support.DefaultDirObjectFactory;
+
 
 /**
  * An interface used by LdapTemplate to map LDAP Contexts to beans. Responsible
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
index 12173efb..ebe4cd73 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
@@ -51,7 +51,7 @@ import org.springframework.ldap.support.LdapUtils;
 /**
  * Implements the interesting methods of the DirContext interface. In particular
  * it contains utility methods for getting and setting Attributes. Using the
- * {@link org.springframework.ldap.core.DefaultDirObjectFactory} in your
+ * {@link org.springframework.ldap.core.support.DefaultDirObjectFactory} in your
  * ContextSource you may receive instances of this class from searches and
  * lookups. This can be particularly useful when updating data, since this class
  * implements {@link org.springframework.ldap.core.AttributeModificationsAware},
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
index aec98b61..41a94cfb 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
@@ -30,7 +30,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.JdkVersion;
 import org.springframework.ldap.core.AuthenticationSource;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.DefaultDirObjectFactory;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.support.LdapUtils;
 
@@ -53,7 +52,7 @@ import org.springframework.ldap.support.LdapUtils;
  * properties are set, in order to finish up initialization.
  * 
  * @see org.springframework.ldap.core.LdapTemplate
- * @see org.springframework.ldap.core.DefaultDirObjectFactory
+ * @see org.springframework.ldap.core.support.DefaultDirObjectFactory
  * @see org.springframework.ldap.core.support.LdapContextSource
  * @see org.springframework.ldap.core.support.DirContextSource
  * 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
similarity index 92%
rename from spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
index d40f5302..6b789d91 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.core;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 
@@ -23,6 +23,9 @@ import javax.naming.Name;
 import javax.naming.directory.Attributes;
 import javax.naming.spi.DirObjectFactory;
 
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DistinguishedName;
+
 
 /**
  * Default implementation of the DirObjectFactory interface. Creates a
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
index 8e3dfdd4..32898802 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
@@ -24,7 +24,6 @@ import javax.naming.directory.BasicAttributes;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.ldap.core.DefaultDirObjectFactory;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;