diff --git a/ntlm/applicationContext.xml b/ntlm/applicationContext.xml
index dcafae3cd7..99e253fcdc 100755
--- a/ntlm/applicationContext.xml
+++ b/ntlm/applicationContext.xml
@@ -3,26 +3,26 @@
 
 <beans>
 
-	<bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
+	<bean id="filterChainProxy" class="org.springframework.security.util.FilterChainProxy">
 		<property name="filterInvocationDefinitionSource">
 			<value>
 			CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 			PATTERN_TYPE_APACHE_ANT
 			/login_error.jsp=httpSessionContextIntegrationFilter
-			/**=httpSessionContextIntegrationFilter, exceptionTranslationFilter, ntlmFilter, filterSecurityInterceptor 
+			/**=httpSessionContextIntegrationFilter, exceptionTranslationFilter, ntlmFilter, filterSecurityInterceptor
 			</value>
 		</property>
 	</bean>
 
 	<!-- The first item in the Chain: httpSessionContextIntegrationFilter -->
-	<bean id="httpSessionContextIntegrationFilter" class="org.acegisecurity.context.HttpSessionContextIntegrationFilter">
+	<bean id="httpSessionContextIntegrationFilter" class="org.springframework.security.context.HttpSessionContextIntegrationFilter">
 		<property name="context">
-			<value>org.acegisecurity.context.SecurityContextImpl</value>
+			<value>org.springframework.security.context.SecurityContextImpl</value>
 		</property>
 	</bean>
 
 	<!-- the second item in the chain: exceptionTranslationFilter -->
-	<bean id="exceptionTranslationFilter" class="org.acegisecurity.ui.ExceptionTranslationFilter">
+	<bean id="exceptionTranslationFilter" class="org.springframework.security.ui.ExceptionTranslationFilter">
 		<property name="authenticationEntryPoint" ref="ntlmEntryPoint"/>
 	</bean>
 
@@ -35,7 +35,7 @@
 		<property name="authenticationManager" ref="providerManager"/>
 	</bean>
 
-	<bean id="providerManager" class="org.acegisecurity.providers.ProviderManager">
+	<bean id="providerManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref local="daoAuthenticationProvider"/>
@@ -43,21 +43,21 @@
         </property>
     </bean>
 
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
 		<property name="userDetailsService">
 			<ref local="memoryUserDetailsService"/>
 		</property>
 	</bean>
 
 	<!-- NOTE: You will need to write a custom UserDetailsService in most cases -->
-	<bean id="memoryUserDetailsService" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="memoryUserDetailsService" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
 		<property name="userMap">
 			<value>jdoe=PASSWORD,ROLE_USER</value>
 		</property>
 	</bean>
 
 	<!-- the fourth item in the chain: filterSecurityInterceptor -->
-	<bean id="filterSecurityInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
+	<bean id="filterSecurityInterceptor" class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
 		<property name="authenticationManager"><ref local="providerManager"/></property>
 		<property name="accessDecisionManager"><ref local="accessDecisionManager"/></property>
 		<property name="objectDefinitionSource">
@@ -70,7 +70,7 @@
 	</bean>
 
 	<!-- authenticationManager defined above -->
-	<bean id="accessDecisionManager" class="org.acegisecurity.vote.UnanimousBased">
+	<bean id="accessDecisionManager" class="org.springframework.security.vote.UnanimousBased">
 		<property name="allowIfAllAbstainDecisions">
 			<value>false</value>
 		</property>
@@ -81,7 +81,7 @@
 		</property>
 	</bean>
 
-	<bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter"/>
+	<bean id="roleVoter" class="org.springframework.security.vote.RoleVoter"/>
 
 	<bean id="ntlmEntryPoint" class="org.springframework.security.ui.ntlm.NtlmProcessingFilterEntryPoint">
 		<property name="authenticationFailureUrl" value="/login_error.jsp"/>
@@ -90,6 +90,6 @@
 	<!-- Done with the chain -->
 
 	<!-- This bean automatically receives AuthenticationEvent messages from DaoAuthenticationProvider -->
-	<bean id="loggerListener" class="org.acegisecurity.event.authentication.LoggerListener"/>
+	<bean id="loggerListener" class="org.springframework.security.event.authentication.LoggerListener"/>
 
 </beans>
diff --git a/ntlm/web.xml b/ntlm/web.xml
index 096ddf75b5..7f4e520a00 100755
--- a/ntlm/web.xml
+++ b/ntlm/web.xml
@@ -18,10 +18,10 @@
 <!-- 2. Setup the Acegi Filter Chain Proxy -->
 	<filter>
 		<filter-name>Acegi Filter Chain Proxy</filter-name>
-		<filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
+		<filter-class>org.springframework.security.FilterToBeanProxy</filter-class>
 		<init-param>
 			<param-name>targetClass</param-name>
-			<param-value>org.acegisecurity.util.FilterChainProxy</param-value>
+			<param-value>org.springframework.security.util.FilterChainProxy</param-value>
 		</init-param>
 	</filter>
 
@@ -36,14 +36,14 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
-<!--	b) Setup a listener to connect spring with log4J --> 
+<!--	b) Setup a listener to connect spring with log4J -->
 	<listener>
 		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
 	</listener>
 
 <!--    c) Setup ACEGI to subscribe to http session events in the web context -->
 	<listener>
-		<listener-class>org.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
+		<listener-class>org.springframework.acegisecurityrk.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
 	</listener>
 
 	<welcome-file-list>
diff --git a/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java b/portlet/src/main/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java
rename to portlet/src/main/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java b/portlet/src/main/java/org/springframework/security/providers/portlet/PortletAuthenticationProvider.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/PortletAuthenticationProvider.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java b/portlet/src/main/java/org/springframework/security/providers/portlet/PortletAuthenticationToken.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/PortletAuthenticationToken.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java b/portlet/src/main/java/org/springframework/security/providers/portlet/PortletAuthoritiesPopulator.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/PortletAuthoritiesPopulator.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java b/portlet/src/main/java/org/springframework/security/providers/portlet/UserCache.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/UserCache.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java b/portlet/src/main/java/org/springframework/security/providers/portlet/cache/EhCacheBasedUserCache.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/cache/EhCacheBasedUserCache.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java b/portlet/src/main/java/org/springframework/security/providers/portlet/cache/NullUserCache.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/cache/NullUserCache.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/package.html b/portlet/src/main/java/org/springframework/security/providers/portlet/cache/package.html
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/cache/package.html
rename to portlet/src/main/java/org/springframework/security/providers/portlet/cache/package.html
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/package.html b/portlet/src/main/java/org/springframework/security/providers/portlet/package.html
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/package.html
rename to portlet/src/main/java/org/springframework/security/providers/portlet/package.html
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java b/portlet/src/main/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java b/portlet/src/main/java/org/springframework/security/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java
rename to portlet/src/main/java/org/springframework/security/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java
diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/package.html b/portlet/src/main/java/org/springframework/security/providers/portlet/populator/package.html
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/providers/portlet/populator/package.html
rename to portlet/src/main/java/org/springframework/security/providers/portlet/populator/package.html
diff --git a/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java b/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingFilterEntryPoint.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java
rename to portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingFilterEntryPoint.java
diff --git a/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java b/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java
rename to portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
diff --git a/portlet/src/main/java/org/acegisecurity/ui/portlet/package.html b/portlet/src/main/java/org/springframework/security/ui/portlet/package.html
similarity index 100%
rename from portlet/src/main/java/org/acegisecurity/ui/portlet/package.html
rename to portlet/src/main/java/org/springframework/security/ui/portlet/package.html
diff --git a/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java b/portlet/src/test/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptorTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java
rename to portlet/src/test/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptorTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java b/portlet/src/test/java/org/springframework/security/providers/portlet/PortletAuthenticationProviderTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java
rename to portlet/src/test/java/org/springframework/security/providers/portlet/PortletAuthenticationProviderTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java b/portlet/src/test/java/org/springframework/security/providers/portlet/PortletAuthenticationTokenTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java
rename to portlet/src/test/java/org/springframework/security/providers/portlet/PortletAuthenticationTokenTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java b/portlet/src/test/java/org/springframework/security/providers/portlet/PortletTestUtils.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java
rename to portlet/src/test/java/org/springframework/security/providers/portlet/PortletTestUtils.java
diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java b/portlet/src/test/java/org/springframework/security/providers/portlet/cache/EhCacheBasedUserCacheTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java
rename to portlet/src/test/java/org/springframework/security/providers/portlet/cache/EhCacheBasedUserCacheTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java
rename to portlet/src/test/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/springframework/security/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java
rename to portlet/src/test/java/org/springframework/security/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java b/portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingFilterEntryPointTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java
rename to portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingFilterEntryPointTests.java
diff --git a/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java b/portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingInterceptorTests.java
similarity index 100%
rename from portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java
rename to portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingInterceptorTests.java