diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/BadLdapGrammarException.java b/spring-ldap/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/BadLdapGrammarException.java
rename to spring-ldap/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
index 6801fdce..a7d55dbd 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/BadLdapGrammarException.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap;
 
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/AcegiAuthenticationSource.java b/spring-ldap/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/authentication/AcegiAuthenticationSource.java
rename to spring-ldap/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java
index 3fd0601c..d29ab60b 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/AcegiAuthenticationSource.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.authentication;
+package org.springframework.ldap.authentication;
 
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContextHolder;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/DefaultValuesAuthenticationSourceDecorator.java b/spring-ldap/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/authentication/DefaultValuesAuthenticationSourceDecorator.java
rename to spring-ldap/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
index e56898e1..669e57ec 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/DefaultValuesAuthenticationSourceDecorator.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.authentication;
+package org.springframework.ldap.authentication;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/package.html b/spring-ldap/src/main/java/org/springframework/ldap/authentication/package.html
similarity index 100%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/authentication/package.html
rename to spring-ldap/src/main/java/org/springframework/ldap/authentication/package.html
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/AbstractRequestControlDirContextProcessor.java b/spring-ldap/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/control/AbstractRequestControlDirContextProcessor.java
rename to spring-ldap/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
index 19d292db..e9b9fdee 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/control/AbstractRequestControlDirContextProcessor.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResult.java b/spring-ldap/src/main/java/org/springframework/ldap/control/PagedResult.java
similarity index 94%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResult.java
rename to spring-ldap/src/main/java/org/springframework/ldap/control/PagedResult.java
index ccb22460..ad0725a6 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResult.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/control/PagedResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import java.util.List;
 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsCookie.java b/spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
similarity index 94%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsCookie.java
rename to spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
index 46d179c2..46e68040 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsCookie.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java b/spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
similarity index 94%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java
rename to spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
index 51d898b5..a16c9ed1 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -92,7 +92,7 @@ public class PagedResultsRequestControl extends
     }
 
     /*
-     * @see org.springframework.ldap.support.control.AbstractRequestControlDirContextProcessor#createRequestControl()
+     * @see org.springframework.ldap.control.AbstractRequestControlDirContextProcessor#createRequestControl()
      */
     public Control createRequestControl() {
         try {
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/package.html b/spring-ldap/src/main/java/org/springframework/ldap/control/package.html
similarity index 100%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/control/package.html
rename to spring-ldap/src/main/java/org/springframework/ldap/control/package.html
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/AttributeModificationsAware.java b/spring-ldap/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/AttributeModificationsAware.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
index 9d0a7fa1..02ce574c 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/AttributeModificationsAware.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import javax.naming.directory.ModificationItem;
 
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 c3ab517c..7d13f0ab 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,8 +20,6 @@ import javax.naming.Binding;
 import javax.naming.Name;
 import javax.naming.directory.SearchResult;
 
-import org.springframework.ldap.support.DefaultDirObjectFactory;
-import org.springframework.ldap.support.DirContextAdapter;
 
 /**
  * An interface used by LdapTemplate to map LDAP Contexts to beans. Responsible
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultDirObjectFactory.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java
similarity index 96%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DefaultDirObjectFactory.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java
index f860cbfb..d40f5302 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultDirObjectFactory.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.Hashtable;
 
@@ -23,6 +23,7 @@ import javax.naming.Name;
 import javax.naming.directory.Attributes;
 import javax.naming.spi.DirObjectFactory;
 
+
 /**
  * Default implementation of the DirObjectFactory interface. Creates a
  * DirContextAdapter from the supplied arguments.
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultDnParserFactory.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
similarity index 90%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DefaultDnParserFactory.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
index e0ccbdc7..adec9282 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultDnParserFactory.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.io.StringReader;
 
+import org.springframework.ldap.core.DnParserImpl;
+
 /**
  * A factory for creating DnParser instances. The actual implementation of
  * DnParser is generated using javacc and should not be constructed directly.
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DirContextAdapter.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
similarity index 96%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DirContextAdapter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
index 6d29df2c..def45fc2 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DirContextAdapter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,15 +46,17 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 /**
  * 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.support.DefaultDirObjectFactory} in your
+ * {@link org.springframework.ldap.core.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.support.AttributeModificationsAware},
+ * {@link org.springframework.ldap.core.AttributeModificationsAware},
  * providing a {@link #getModificationItems()} method.
  * 
  * @author Magnus Robertsson
@@ -158,7 +160,7 @@ public class DirContextAdapter implements DirContextOperations {
      * @param mode
      *            Update mode.
      */
-    protected void setUpdateMode(boolean mode) {
+    public void setUpdateMode(boolean mode) {
         this.updateMode = mode;
         if (updateMode) {
             updatedAttrs = new BasicAttributes(true);
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DirContextOperations.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextOperations.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DirContextOperations.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/DirContextOperations.java
index c44f3fbd..e3e5185c 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DirContextOperations.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DirContextOperations.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.SortedSet;
 
 import javax.naming.Name;
 import javax.naming.directory.DirContext;
 
+
 /**
  * Interface for DirContextAdapter to simplify mock testing.
  * 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DistinguishedName.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DistinguishedName.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DistinguishedName.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/DistinguishedName.java
index 7d4f5075..0374c34f 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DistinguishedName.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DistinguishedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.Collections;
 import java.util.Enumeration;
@@ -28,7 +28,8 @@ import javax.naming.InvalidNameException;
 import javax.naming.Name;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.ldap.util.ListComparator;
+import org.springframework.ldap.BadLdapGrammarException;
+import org.springframework.ldap.support.ListComparator;
 
 /**
  * Default implementation of a Name corresponding to an LDAP path. A
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DnParser.java b/spring-ldap/src/main/java/org/springframework/ldap/core/DnParser.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DnParser.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/DnParser.java
index 7bd29baa..eb11325c 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DnParser.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/DnParser.java
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
+
 
 
 /**
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapEncoder.java b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapEncoder.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/LdapEncoder.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/LdapEncoder.java
index 0fb56752..be93abf0 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapEncoder.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapEncoder.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.ldap.BadLdapGrammarException;
 
 /**
  * Helper class to encode and decode ldap names and values.
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapRdn.java b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdn.java
similarity index 94%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/LdapRdn.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdn.java
index c2d7e4d2..a58a57f4 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapRdn.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdn.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.io.Serializable;
 import java.util.Comparator;
@@ -22,7 +22,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.springframework.ldap.util.ListComparator;
+import org.springframework.ldap.BadLdapGrammarException;
+import org.springframework.ldap.support.ListComparator;
 
 /**
  * Datatype for a LDAP name, a part of a path.
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapRdnComponent.java b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/LdapRdnComponent.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
index 52bd4e72..4e93d230 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapRdnComponent.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index c56a7441..dcc41ca9 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -36,8 +36,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DistinguishedName;
 import org.springframework.ldap.support.EntryNotFoundException;
 import org.springframework.ldap.support.NamingExceptionTranslator;
 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/AbstractContextSource.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
similarity index 94%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/AbstractContextSource.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
index 1b700bc5..0c07c634 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/AbstractContextSource.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -30,6 +30,10 @@ 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.DefaultNamingExceptionTranslator;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 /**
  * Abstract implementation of the ContextSource interface. By default, returns
@@ -50,9 +54,9 @@ import org.springframework.ldap.core.ContextSource;
  * properties are set, in order to finish up initialization.
  * 
  * @see org.springframework.ldap.core.LdapTemplate
- * @see org.springframework.ldap.support.DefaultDirObjectFactory
- * @see org.springframework.ldap.support.LdapContextSource
- * @see org.springframework.ldap.support.DirContextSource
+ * @see org.springframework.ldap.core.DefaultDirObjectFactory
+ * @see org.springframework.ldap.core.support.LdapContextSource
+ * @see org.springframework.ldap.core.support.DirContextSource
  * 
  * @author Mattias Arthursson
  * @author Adam Skogman
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/AggregateDirContextProcessor.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/AggregateDirContextProcessor.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
index 710a7de5..a099517e 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/AggregateDirContextProcessor.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/CountNameClassPairCallbackHandler.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/CountNameClassPairCallbackHandler.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
index 7b7473c8..9c31953d 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/CountNameClassPairCallbackHandler.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import javax.naming.NameClassPair;
 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DirContextSource.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
similarity index 84%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/DirContextSource.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
index e69d6a0a..229d53fd 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DirContextSource.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 
@@ -22,12 +22,13 @@ import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
+
 /**
  * ContextSource implementation which creates InitialDirContext instances, for
  * LDAPv2 compatibility. For configuration information, see
- * {@link org.springframework.ldap.support.AbstractContextSource AbstractContextSource}.
+ * {@link org.springframework.ldap.core.support.AbstractContextSource AbstractContextSource}.
  * 
- * @see org.springframework.ldap.support.AbstractContextSource
+ * @see org.springframework.ldap.core.support.AbstractContextSource
  * 
  * @author Mattias Arthursson
  */
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapContextSource.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
similarity index 91%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/LdapContextSource.java
rename to spring-ldap/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
index ef3e7597..4179d150 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/LdapContextSource.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 
@@ -24,14 +24,15 @@ import javax.naming.ldap.ControlFactory;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
+
 import com.sun.jndi.ldap.ctl.ResponseControlFactory;
 
 /**
  * ContextSource implementation which creates an <code>InitialLdapContext</code>
  * instance. For configuration information, see
- * {@link org.springframework.ldap.support.AbstractContextSource AbstractContextSource}.
+ * {@link org.springframework.ldap.core.support.AbstractContextSource AbstractContextSource}.
  * 
- * @see org.springframework.ldap.support.AbstractContextSource
+ * @see org.springframework.ldap.core.support.AbstractContextSource
  * 
  * @author Mattias Arthursson
  * @author Adam Skogman
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/AbstractFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/AbstractFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
index e00f8f04..3de1bf30 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/AbstractFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * Convenience class that implements most of the methods in the Filter
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/AndFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/AndFilter.java
similarity index 85%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/AndFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/AndFilter.java
index 4622da1f..122a23e2 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/AndFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/AndFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * A filter for a logical AND. E.g.:
@@ -28,7 +28,7 @@ package org.springframework.ldap.support.filter;
  * 
  * would result in: <code>(&amp;(objectclass=person)(cn=Some CN))</code>
  * 
- * @see org.springframework.ldap.support.filter.EqualsFilter
+ * @see org.springframework.ldap.filter.EqualsFilter
  * @author Adam Skogman
  * @author Mattias Arthursson
  */
@@ -39,7 +39,7 @@ public class AndFilter extends BinaryLogicalFilter {
     /*
      * (non-Javadoc)
      * 
-     * @see org.springframework.ldap.support.filter.BinaryLogicalFilter#getLogicalOperator()
+     * @see org.springframework.ldap.filter.BinaryLogicalFilter#getLogicalOperator()
      */
     protected String getLogicalOperator() {
         return AMPERSAND;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/BinaryLogicalFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
similarity index 86%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/BinaryLogicalFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
index 0c3ef3a2..4bde7495 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/BinaryLogicalFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -34,7 +34,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
     protected List queryList = new LinkedList();
 
     /**
-     * @see org.springframework.ldap.support.filter.Filter#encode(java.lang.StringBuffer)
+     * @see org.springframework.ldap.filter.Filter#encode(java.lang.StringBuffer)
      */
     public StringBuffer encode(StringBuffer buff) {
         if (queryList.size() <= 0) {
@@ -73,7 +73,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
     /**
      * Compares each filter in turn
      * 
-     * @see org.springframework.ldap.support.filter.Filter#equals(java.lang.Object)
+     * @see org.springframework.ldap.filter.Filter#equals(java.lang.Object)
      */
     public boolean equals(Object obj) {
         if (obj instanceof BinaryLogicalFilter
@@ -87,7 +87,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
     /**
      * Hashes all contained data
      * 
-     * @see org.springframework.ldap.support.filter.Filter#hashCode()
+     * @see org.springframework.ldap.filter.Filter#hashCode()
      */
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/CompareFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/CompareFilter.java
similarity index 87%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/CompareFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/CompareFilter.java
index 20fc78f0..836e7374 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/CompareFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/CompareFilter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * Abstract superclass for filters to compare values.
@@ -72,7 +72,7 @@ public abstract class CompareFilter extends AbstractFilter {
     }
 
     /*
-     * @see org.springframework.ldap.support.filter.AbstractFilter#encode(java.lang.StringBuffer)
+     * @see org.springframework.ldap.filter.AbstractFilter#encode(java.lang.StringBuffer)
      */
     public StringBuffer encode(StringBuffer buff) {
         buff.append('(');
@@ -85,7 +85,7 @@ public abstract class CompareFilter extends AbstractFilter {
     /**
      * Compares key and value before encoding.
      * 
-     * @see org.springframework.ldap.support.filter.Filter#equals(java.lang.Object)
+     * @see org.springframework.ldap.filter.Filter#equals(java.lang.Object)
      */
     public boolean equals(Object o) {
         if (o instanceof CompareFilter && o.getClass() == this.getClass()) {
@@ -102,7 +102,7 @@ public abstract class CompareFilter extends AbstractFilter {
     /**
      * Calculate the hash code for the attribute and the value.
      * 
-     * @see org.springframework.ldap.support.filter.Filter#hashCode()
+     * @see org.springframework.ldap.filter.Filter#hashCode()
      */
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/EqualsFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
similarity index 88%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/EqualsFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
index 069d8186..465dcff9 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/EqualsFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 
 /**
@@ -49,7 +49,7 @@ public class EqualsFilter extends CompareFilter {
     }
 
     /*
-     * @see org.springframework.ldap.support.filter.CompareFilter#getCompareString()
+     * @see org.springframework.ldap.filter.CompareFilter#getCompareString()
      */
     protected String getCompareString() {
         return EQUALS_SIGN;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/Filter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/Filter.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/Filter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/Filter.java
index a5ae4f69..103b9dbe 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/Filter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/Filter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * Common interface for filters.
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/GreaterThanOrEqualsFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/GreaterThanOrEqualsFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
index 871b8dd1..03b48db0 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/GreaterThanOrEqualsFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * A filter to compare >=. LDAP RFC does not allow > comparison. The following
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/LessThanOrEqualsFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
similarity index 93%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/LessThanOrEqualsFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
index 36b5e723..26b299f1 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/LessThanOrEqualsFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * A filter to compare <=. LDAP RFC does not allow < comparison. The following
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/LikeFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/LikeFilter.java
similarity index 91%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/LikeFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/LikeFilter.java
index 41d46ebd..ef73c93c 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/LikeFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/LikeFilter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
-import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * This filter allows the user to specify wildcards (*) by not escaping them in
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/NotFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/NotFilter.java
similarity index 83%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/NotFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/NotFilter.java
index 972edfa5..ab7c95a7 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/NotFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/NotFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import org.apache.commons.lang.Validate;
 
@@ -50,7 +50,7 @@ public class NotFilter extends AbstractFilter {
     }
 
     /**
-     * @see org.springframework.ldap.support.filter.Filter#encode(java.lang.StringBuffer)
+     * @see org.springframework.ldap.filter.Filter#encode(java.lang.StringBuffer)
      */
     public StringBuffer encode(StringBuffer buff) {
 
@@ -65,7 +65,7 @@ public class NotFilter extends AbstractFilter {
     /**
      * Compares key and value before encoding
      * 
-     * @see org.springframework.ldap.support.filter.Filter#equals(java.lang.Object)
+     * @see org.springframework.ldap.filter.Filter#equals(java.lang.Object)
      */
     public boolean equals(Object o) {
 
@@ -80,7 +80,7 @@ public class NotFilter extends AbstractFilter {
     /**
      * hash attribute and value
      * 
-     * @see org.springframework.ldap.support.filter.Filter#hashCode()
+     * @see org.springframework.ldap.filter.Filter#hashCode()
      */
     public int hashCode() {
         return HASH ^ filter.hashCode();
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/OrFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/OrFilter.java
similarity index 88%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/OrFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/OrFilter.java
index 20ff1ddf..12769cb7 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/OrFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/OrFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * Filter for logical OR.
@@ -51,7 +51,7 @@ public class OrFilter extends BinaryLogicalFilter {
     /*
      * (non-Javadoc)
      * 
-     * @see org.springframework.ldap.support.filter.BinaryLogicalFilter#getLogicalOperator()
+     * @see org.springframework.ldap.filter.BinaryLogicalFilter#getLogicalOperator()
      */
     protected String getLogicalOperator() {
         return PIPE_SIGN;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/WhitespaceWildcardsFilter.java b/spring-ldap/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
similarity index 92%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/WhitespaceWildcardsFilter.java
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
index bbd6b8d0..d855cd1b 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/WhitespaceWildcardsFilter.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * This filter automatically converts all whitespace to wildcards (*). The
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/package.html b/spring-ldap/src/main/java/org/springframework/ldap/filter/package.html
similarity index 100%
rename from spring-ldap/src/main/java/org/springframework/ldap/support/filter/package.html
rename to spring-ldap/src/main/java/org/springframework/ldap/filter/package.html
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultNamingExceptionTranslator.java b/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultNamingExceptionTranslator.java
index 258f9ba0..5b056b2b 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultNamingExceptionTranslator.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/support/DefaultNamingExceptionTranslator.java
@@ -30,6 +30,7 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.ldap.BadLdapGrammarException;
 
 /**
  * The default implementation of NamingExceptionTranslator.
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/util/ListComparator.java b/spring-ldap/src/main/java/org/springframework/ldap/support/ListComparator.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/util/ListComparator.java
rename to spring-ldap/src/main/java/org/springframework/ldap/support/ListComparator.java
index 0ea9857c..5e2ee13c 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/util/ListComparator.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/support/ListComparator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.util;
+package org.springframework.ldap.support;
 
 import java.util.Comparator;
 import java.util.List;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/util/package.html b/spring-ldap/src/main/java/org/springframework/ldap/util/package.html
deleted file mode 100644
index 1bb28e68..00000000
--- a/spring-ldap/src/main/java/org/springframework/ldap/util/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-
-Internal utility classes.
-
-</body>
-</html>
diff --git a/spring-ldap/src/main/javacc/DnParserImpl.jj b/spring-ldap/src/main/javacc/DnParserImpl.jj
index 3660fcc3..9a6d4cbc 100644
--- a/spring-ldap/src/main/javacc/DnParserImpl.jj
+++ b/spring-ldap/src/main/javacc/DnParserImpl.jj
@@ -43,11 +43,7 @@ options {
 
 PARSER_BEGIN(DnParserImpl)
 
-package org.springframework.ldap.support;
-
-import org.springframework.ldap.support.LdapRdn;
-import org.springframework.ldap.support.LdapRdnComponent;
-import org.springframework.ldap.support.DistinguishedName;
+package org.springframework.ldap.core;
 
 public class DnParserImpl implements DnParser{