diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java
index b90811a6..0aaa70b4 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.ldap.EntryNotFoundException;
 import org.springframework.ldap.samples.person.domain.Group;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
+import org.springframework.ldap.support.EntryNotFoundException;
 
 public class DummyGroupDao implements GroupDao {
     private static Map GROUPS;
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java
index f2e5613c..08685af8 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.ldap.EntryNotFoundException;
 import org.springframework.ldap.samples.person.domain.Person;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
+import org.springframework.ldap.support.EntryNotFoundException;
 
 public class DummyPersonDao implements PersonDao {
     private static Map PERSONS;
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
index d6a58e17..cd50877a 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
@@ -17,12 +17,12 @@ package org.springframework.ldap.samples.person.dao;
 
 import javax.naming.NamingException;
 
-import org.springframework.ldap.DefaultNamingExceptionTranslator;
-import org.springframework.ldap.NamingExceptionTranslator;
 import org.springframework.ldap.core.ContextMapper;
 import org.springframework.ldap.samples.person.domain.Person;
+import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
 import org.springframework.ldap.support.DirContextOperations;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 import org.springframework.util.Assert;
 
 /**