diff --git a/ntlm/applicationContext.xml b/ntlm/applicationContext.xml
index c32db1ac7b..dcafae3cd7 100755
--- a/ntlm/applicationContext.xml
+++ b/ntlm/applicationContext.xml
@@ -27,7 +27,7 @@
 	</bean>
 
 	<!-- the third item in the chain: ntlmFilter -->
-	<bean id="ntlmFilter" class="org.acegisecurity.ui.ntlm.NtlmProcessingFilter">
+	<bean id="ntlmFilter" class="org.springframework.security.ui.ntlm.NtlmProcessingFilter">
 		<property name="defaultDomain" value="YOURDOMAIN"/>
 		<!-- It is better to use a WINS server if available over a specific domain controller
  		<property name="domainController" value="FOO"/> -->
@@ -83,7 +83,7 @@
 
 	<bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter"/>
 
-	<bean id="ntlmEntryPoint" class="org.acegisecurity.ui.ntlm.NtlmProcessingFilterEntryPoint">
+	<bean id="ntlmEntryPoint" class="org.springframework.security.ui.ntlm.NtlmProcessingFilterEntryPoint">
 		<property name="authenticationFailureUrl" value="/login_error.jsp"/>
 	</bean>
 
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/HttpFilter.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/HttpFilter.java
similarity index 95%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/HttpFilter.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/HttpFilter.java
index 503a1539df..f36c237bda 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/HttpFilter.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/HttpFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
+package org.springframework.security.ui.ntlm;
 
 import java.io.IOException;
 
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmBaseException.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java
similarity index 93%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmBaseException.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java
index ca5c694f0f..12c1325bcb 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmBaseException.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
+package org.springframework.security.ui.ntlm;
 
 import org.acegisecurity.AuthenticationException;
 
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmBeginHandshakeException.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBeginHandshakeException.java
similarity index 87%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmBeginHandshakeException.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBeginHandshakeException.java
index 37f0e6f2ac..4ebd67570d 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmBeginHandshakeException.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBeginHandshakeException.java
@@ -13,9 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
-
-import org.acegisecurity.AuthenticationException;
+package org.springframework.security.ui.ntlm;
 
 /**
  * Signals the beginning of an NTLM handshaking process.
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
similarity index 94%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
index e3910f31b3..2777772c6f 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
@@ -13,19 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
+package org.springframework.security.ui.ntlm;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -42,7 +37,6 @@ import jcifs.smb.SmbException;
 import jcifs.smb.SmbSession;
 import jcifs.util.Base64;
 
-import org.acegisecurity.AcegiMessageSource;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.AuthenticationCredentialsNotFoundException;
 import org.acegisecurity.AuthenticationException;
@@ -50,17 +44,13 @@ import org.acegisecurity.AuthenticationManager;
 import org.acegisecurity.BadCredentialsException;
 import org.acegisecurity.InsufficientAuthenticationException;
 import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
 import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import org.acegisecurity.ui.AbstractProcessingFilter;
 import org.acegisecurity.ui.WebAuthenticationDetails;
-import org.acegisecurity.ui.savedrequest.SavedRequest;
 import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.util.Assert;
 
 /**
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java
similarity index 93%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java
index 1f52a44647..d46eb59ac9 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
+package org.springframework.security.ui.ntlm;
 
-import org.acegisecurity.AuthenticationCredentialsNotFoundException;
 import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.InsufficientAuthenticationException;
 import org.acegisecurity.ui.AuthenticationEntryPoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,8 +30,6 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import jcifs.Config;
-
 /**
  * Used by <code>ExceptionTranslationFilter</code> to assist with the NTLM
  * negotiation.  Also handles redirecting the user to the authentication
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmType2MessageException.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java
similarity index 91%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmType2MessageException.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java
index 5e4a09ed5b..d67c849419 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmType2MessageException.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
+package org.springframework.security.ui.ntlm;
 
 import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
 import org.acegisecurity.context.SecurityContextHolder;
 
 /**
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
similarity index 95%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
index cd21dd29e6..ba248e87cd 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.ntlm;
+package org.springframework.security.ui.ntlm;
 
 import jcifs.smb.NtlmPasswordAuthentication;
 
diff --git a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
similarity index 93%
rename from ntlm/src/main/java/org/acegisecurity/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
rename to ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
index 981b566cb3..514e217ebb 100755
--- a/ntlm/src/main/java/org/acegisecurity/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package org.acegisecurity.ui.ntlm.ldap.authenticator;
+package org.springframework.security.ui.ntlm.ldap.authenticator;
 
 import java.util.Iterator;
 
@@ -10,7 +10,7 @@ import org.acegisecurity.Authentication;
 import org.acegisecurity.ldap.InitialDirContextFactory;
 import org.acegisecurity.ldap.SpringSecurityLdapTemplate;
 import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator;
-import org.acegisecurity.ui.ntlm.NtlmUsernamePasswordAuthenticationToken;
+import org.springframework.security.ui.ntlm.NtlmUsernamePasswordAuthenticationToken;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.DirContextOperations;