From 4bc60d1740d2120c209adf108f04e2da72ed8049 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 25 Mar 2015 08:00:09 +0000
Subject: [PATCH] Drop extensions from package names

- Throughout the codebase dropping extensions
  from org.springframework.security.extensions.kerberos.
- Fixes #16
---
 build.gradle                                  |  4 +-
 .../src/reference/asciidoc/samples/.gitignore |  1 +
 .../asciidoc/samples/WebSecurityConfig1.xml   | 42 -------------
 publish-maven.gradle                          |  4 +-
 .../client/KerberosLdapContextSource.java     |  8 +--
 .../kerberos/client/KerberosRestTemplate.java |  2 +-
 .../client/config/SunJaasKrb5LoginConfig.java |  2 +-
 .../client/KerberosRestTemplateTests.java     |  7 ++-
 .../kerberos/client/WebSecurityConfig.java    | 10 +--
 .../WebSecurityConfigSpnegoForward.java       | 10 +--
 .../WebSecurityConfigSuccessHandler.java      | 12 ++--
 .../docs/KerberosRestTemplateConfig.java      |  4 +-
 .../kerberos/GlobalSunJaasKerberosConfig.java |  2 +-
 .../KerberosAuthenticationProvider.java       |  2 +-
 .../kerberos/KerberosClient.java              |  2 +-
 ...KerberosServiceAuthenticationProvider.java |  6 +-
 .../kerberos/KerberosServiceRequestToken.java |  6 +-
 .../kerberos/KerberosTicketValidator.java     |  2 +-
 .../kerberos/SunJaasKerberosClient.java       |  2 +-
 .../SunJaasKerberosTicketValidator.java       |  2 +-
 ...gKerberosAuthenticationSuccessHandler.java |  4 +-
 .../SpnegoAuthenticationProcessingFilter.java | 14 ++---
 .../kerberos/web/SpnegoEntryPoint.java        |  2 +-
 .../kerberos/docs/AuthProviderConfig.xml      | 42 -------------
 .../extensions/kerberos/docs/SpnegoConfig.xml | 63 -------------------
 .../KerberosAuthenticationProviderTest.java   |  4 +-
 ...erosServiceAuthenticationProviderTest.java |  7 ++-
 .../kerberos/docs/AuthProviderConfig.java     |  6 +-
 .../kerberos/docs}/AuthProviderConfig.xml     |  8 +--
 .../docs/DummyUserDetailsService.java         |  2 +-
 .../kerberos/docs/SpnegoConfig.java           | 14 ++---
 .../security/kerberos/docs}/SpnegoConfig.xml  | 14 ++---
 ...egoAuthenticationProcessingFilterTest.java |  7 ++-
 .../kerberos/web/SpnegoEntryPointTest.java    |  3 +-
 .../src/main/java/demo/app/Application.java   |  2 +-
 .../main/java/demo/app/WebSecurityConfig.java |  4 +-
 .../src/main/resources/websecurityconfig.xml  | 12 ++--
 .../main/java/demo/app/WebSecurityConfig.java | 12 ++--
 .../main/java/demo/app/WebSecurityConfig.java | 12 ++--
 .../test/KerberosSecurityTestcase.java        |  2 +-
 .../kerberos/test/MiniKdc.java                |  2 +-
 .../kerberos/test/TestMiniKdc.java            |  6 +-
 42 files changed, 117 insertions(+), 255 deletions(-)
 delete mode 100644 docs/src/reference/asciidoc/samples/WebSecurityConfig1.xml
 rename spring-security-kerberos-client/src/main/java/org/springframework/security/{extensions => }/kerberos/client/KerberosLdapContextSource.java (92%)
 rename spring-security-kerberos-client/src/main/java/org/springframework/security/{extensions => }/kerberos/client/KerberosRestTemplate.java (99%)
 rename spring-security-kerberos-client/src/main/java/org/springframework/security/{extensions => }/kerberos/client/config/SunJaasKrb5LoginConfig.java (98%)
 rename spring-security-kerberos-client/src/test/java/org/springframework/security/{extensions => }/kerberos/client/KerberosRestTemplateTests.java (97%)
 rename spring-security-kerberos-client/src/test/java/org/springframework/security/{extensions => }/kerberos/client/WebSecurityConfig.java (90%)
 rename spring-security-kerberos-client/src/test/java/org/springframework/security/{extensions => }/kerberos/client/WebSecurityConfigSpnegoForward.java (90%)
 rename spring-security-kerberos-client/src/test/java/org/springframework/security/{extensions => }/kerberos/client/WebSecurityConfigSuccessHandler.java (89%)
 rename spring-security-kerberos-client/src/test/java/org/springframework/security/{extensions => }/kerberos/client/docs/KerberosRestTemplateConfig.java (88%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/GlobalSunJaasKerberosConfig.java (97%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/KerberosAuthenticationProvider.java (97%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/KerberosClient.java (93%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/KerberosServiceAuthenticationProvider.java (95%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/KerberosServiceRequestToken.java (96%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/KerberosTicketValidator.java (97%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/SunJaasKerberosClient.java (98%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/SunJaasKerberosTicketValidator.java (99%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java (91%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/web/SpnegoAuthenticationProcessingFilter.java (94%)
 rename spring-security-kerberos-core/src/main/java/org/springframework/security/{extensions => }/kerberos/web/SpnegoEntryPoint.java (98%)
 delete mode 100644 spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.xml
 delete mode 100644 spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.xml
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/KerberosAuthenticationProviderTest.java (94%)
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/KerberosServiceAuthenticationProviderTest.java (94%)
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/docs/AuthProviderConfig.java (91%)
 rename {docs/src/reference/asciidoc/samples => spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs}/AuthProviderConfig.xml (80%)
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/docs/DummyUserDetailsService.java (95%)
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/docs/SpnegoConfig.java (88%)
 rename {docs/src/reference/asciidoc/samples => spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs}/SpnegoConfig.xml (77%)
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java (96%)
 rename spring-security-kerberos-core/src/test/java/org/springframework/security/{extensions => }/kerberos/web/SpnegoEntryPointTest.java (96%)
 rename spring-security-kerberos-test/src/main/java/org/springframework/security/{extensions => }/kerberos/test/KerberosSecurityTestcase.java (96%)
 rename spring-security-kerberos-test/src/main/java/org/springframework/security/{extensions => }/kerberos/test/MiniKdc.java (99%)
 rename spring-security-kerberos-test/src/test/java/org/springframework/security/{extensions => }/kerberos/test/TestMiniKdc.java (96%)

diff --git a/build.gradle b/build.gradle
index 96efe92..0b0a246 100644
--- a/build.gradle
+++ b/build.gradle
@@ -233,8 +233,8 @@ configure(rootProject) {
 	}
 
 	task copyDocsSamples(type: Copy) {
-		from 'spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/'
-		from 'spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/docs/'
+		from 'spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/'
+		from 'spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/'
 		include '**/*.java'
 		include '**/*.xml'
 		into 'docs/src/reference/asciidoc/samples'
diff --git a/docs/src/reference/asciidoc/samples/.gitignore b/docs/src/reference/asciidoc/samples/.gitignore
index 27d1535..b305868 100644
--- a/docs/src/reference/asciidoc/samples/.gitignore
+++ b/docs/src/reference/asciidoc/samples/.gitignore
@@ -1 +1,2 @@
 *.java
+*.xml
diff --git a/docs/src/reference/asciidoc/samples/WebSecurityConfig1.xml b/docs/src/reference/asciidoc/samples/WebSecurityConfig1.xml
deleted file mode 100644
index c18252f..0000000
--- a/docs/src/reference/asciidoc/samples/WebSecurityConfig1.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- tag::snippetA[] -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:sec="http://www.springframework.org/schema/security"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
-
-  <sec:http>
-    <sec:intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_FULLY" />
-    <sec:form-login login-page="/login.html" default-target-url="/secure/index.jsp"/>
-  </sec:http>
-
-  <sec:authentication-manager alias="authenticationManager">
-    <sec:authentication-provider ref="kerberosAuthenticationProvider"/>
-  </sec:authentication-manager>
-
-  <bean id="kerberosAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider">
-    <property name="kerberosClient">
-      <bean class="org.springframework.security.extensions.kerberos.SunJaasKerberosClient">
-        <property name="debug" value="${krb.debug}"/>
-      </bean>
-    </property>
-    <property name="userDetailsService" ref="dummyUserDetailsService"/>
-  </bean>
-
-  <bean
-    class="org.springframework.security.extensions.kerberos.GlobalSunJaasKerberosConfig">
-    <property name="debug" value="${krb.debug}" />
-    <!-- You can point to a different kerberos config location here, if you don't want the default one -->
-    <property name="krbConfLocation" value="${krb.conf.location}"/>
-  </bean>
-
-  <bean id="dummyUserDetailsService"
-    class="org.springframework.security.extensions.kerberos.sample.DummyUserDetailsService" />
-
-  <context:property-placeholder location="/WEB-INF/kerberos.properties"/>
-</beans>
-<!-- end::snippetA[] -->
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 8076d2c..f0461b0 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -31,10 +31,10 @@ def customizePom(pom, gradleProject) {
         generatedPom.project {
             name = gradleProject.description
             description = gradleProject.description
-            url = 'http://static.springsource.org/spring-security/site/extensions/krb/index.html'
+            url = 'http://projects.spring.io/spring-security-kerberos'
             organization {
                 name = 'SpringSource'
-                url = 'http://springsource.org/spring-security-kerberos'
+                url = 'http://projects.spring.io/spring-security-kerberos/'
             }
             licenses {
                 license {
diff --git a/spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/KerberosLdapContextSource.java b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosLdapContextSource.java
similarity index 92%
rename from spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/KerberosLdapContextSource.java
rename to spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosLdapContextSource.java
index 5240e4c..6eb2b2a 100644
--- a/spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/KerberosLdapContextSource.java
+++ b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosLdapContextSource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client;
+package org.springframework.security.kerberos.client;
 
 import java.security.PrivilegedAction;
 import java.util.Hashtable;
@@ -30,7 +30,7 @@ import javax.security.auth.login.LoginException;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.ldap.core.support.LdapContextSource;
-import org.springframework.security.extensions.kerberos.client.config.SunJaasKrb5LoginConfig;
+import org.springframework.security.kerberos.client.config.SunJaasKrb5LoginConfig;
 import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
 import org.springframework.util.Assert;
 
@@ -41,12 +41,12 @@ import org.springframework.util.Assert;
  * Example usage:
  *
  * <pre>
- *  &lt;bean id=&quot;authorizationContextSource&quot; class=&quot;org.springframework.security.extensions.kerberos.ldap.KerberosLdapContextSource&quot;&gt;
+ *  &lt;bean id=&quot;authorizationContextSource&quot; class=&quot;org.springframework.security.kerberos.ldap.KerberosLdapContextSource&quot;&gt;
  *      &lt;constructor-arg value=&quot;${authentication.ldap.ldapUrl}&quot; /&gt;
  *      &lt;property name=&quot;referral&quot; value=&quot;ignore&quot; /&gt;
  *
  *       &lt;property name=&quot;loginConfig&quot;&gt;
- *           &lt;bean class=&quot;org.springframework.security.extensions.kerberos.client.config.SunJaasKrb5LoginConfig&quot;&gt;
+ *           &lt;bean class=&quot;org.springframework.security.kerberos.client.config.SunJaasKrb5LoginConfig&quot;&gt;
  *               &lt;property name=&quot;servicePrincipal&quot; value=&quot;${authentication.ldap.servicePrincipal}&quot; /&gt;
  *               &lt;property name=&quot;useTicketCache&quot; value=&quot;true&quot; /&gt;
  *               &lt;property name=&quot;isInitiator&quot; value=&quot;true&quot; /&gt;
diff --git a/spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/KerberosRestTemplate.java b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosRestTemplate.java
similarity index 99%
rename from spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/KerberosRestTemplate.java
rename to spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosRestTemplate.java
index a452262..c10e80b 100644
--- a/spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/KerberosRestTemplate.java
+++ b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosRestTemplate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client;
+package org.springframework.security.kerberos.client;
 
 import java.net.URI;
 import java.security.Principal;
diff --git a/spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/config/SunJaasKrb5LoginConfig.java b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/config/SunJaasKrb5LoginConfig.java
similarity index 98%
rename from spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/config/SunJaasKrb5LoginConfig.java
rename to spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/config/SunJaasKrb5LoginConfig.java
index 68f28c7..5bd9e56 100644
--- a/spring-security-kerberos-client/src/main/java/org/springframework/security/extensions/kerberos/client/config/SunJaasKrb5LoginConfig.java
+++ b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/config/SunJaasKrb5LoginConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client.config;
+package org.springframework.security.kerberos.client.config;
 
 import java.util.HashMap;
 
diff --git a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/KerberosRestTemplateTests.java b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/KerberosRestTemplateTests.java
similarity index 97%
rename from spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/KerberosRestTemplateTests.java
rename to spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/KerberosRestTemplateTests.java
index ae940aa..685cc42 100644
--- a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/KerberosRestTemplateTests.java
+++ b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/KerberosRestTemplateTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client;
+package org.springframework.security.kerberos.client;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -49,8 +49,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.security.extensions.kerberos.test.KerberosSecurityTestcase;
-import org.springframework.security.extensions.kerberos.test.MiniKdc;
+import org.springframework.security.kerberos.client.KerberosRestTemplate;
+import org.springframework.security.kerberos.test.KerberosSecurityTestcase;
+import org.springframework.security.kerberos.test.MiniKdc;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfig.java b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfig.java
similarity index 90%
rename from spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfig.java
rename to spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfig.java
index e956d57..074c3c8 100644
--- a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfig.java
+++ b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client;
+package org.springframework.security.kerberos.client;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -29,10 +29,10 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
-import org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosTicketValidator;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 @Configuration
diff --git a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfigSpnegoForward.java b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfigSpnegoForward.java
similarity index 90%
rename from spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfigSpnegoForward.java
rename to spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfigSpnegoForward.java
index 4d699b3..07805d1 100644
--- a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfigSpnegoForward.java
+++ b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfigSpnegoForward.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client;
+package org.springframework.security.kerberos.client;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -29,10 +29,10 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
-import org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosTicketValidator;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 @Configuration
diff --git a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfigSuccessHandler.java b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfigSuccessHandler.java
similarity index 89%
rename from spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfigSuccessHandler.java
rename to spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfigSuccessHandler.java
index 4171d32..9d5240e 100644
--- a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/WebSecurityConfigSuccessHandler.java
+++ b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/WebSecurityConfigSuccessHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client;
+package org.springframework.security.kerberos.client;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -29,11 +29,11 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator;
-import org.springframework.security.extensions.kerberos.web.ResponseHeaderSettingKerberosAuthenticationSuccessHandler;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
-import org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosTicketValidator;
+import org.springframework.security.kerberos.web.ResponseHeaderSettingKerberosAuthenticationSuccessHandler;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 @Configuration
diff --git a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/docs/KerberosRestTemplateConfig.java b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosRestTemplateConfig.java
similarity index 88%
rename from spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/docs/KerberosRestTemplateConfig.java
rename to spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosRestTemplateConfig.java
index c49b112..ddff55f 100644
--- a/spring-security-kerberos-client/src/test/java/org/springframework/security/extensions/kerberos/client/docs/KerberosRestTemplateConfig.java
+++ b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosRestTemplateConfig.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.client.docs;
+package org.springframework.security.kerberos.client.docs;
 
-import org.springframework.security.extensions.kerberos.client.KerberosRestTemplate;
+import org.springframework.security.kerberos.client.KerberosRestTemplate;
 
 public class KerberosRestTemplateConfig {
 
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/GlobalSunJaasKerberosConfig.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/GlobalSunJaasKerberosConfig.java
similarity index 97%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/GlobalSunJaasKerberosConfig.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/GlobalSunJaasKerberosConfig.java
index e9903eb..84672c9 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/GlobalSunJaasKerberosConfig.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/GlobalSunJaasKerberosConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosAuthenticationProvider.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosAuthenticationProvider.java
similarity index 97%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosAuthenticationProvider.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosAuthenticationProvider.java
index d395ecf..dc07c64 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosAuthenticationProvider.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosAuthenticationProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosClient.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosClient.java
similarity index 93%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosClient.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosClient.java
index 2ff0682..a4ab32e 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosClient.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 /**
  * 
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceAuthenticationProvider.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosServiceAuthenticationProvider.java
similarity index 95%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceAuthenticationProvider.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosServiceAuthenticationProvider.java
index 9474858..ff0a229 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceAuthenticationProvider.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosServiceAuthenticationProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -25,8 +25,8 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsChecker;
 import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.extensions.kerberos.KerberosTicketValidator.KerberosTicketValidation;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.KerberosTicketValidator.KerberosTicketValidation;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosServiceRequestToken.java
similarity index 96%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosServiceRequestToken.java
index 64575be..45c2888 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosServiceRequestToken.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import java.io.UnsupportedEncodingException;
 import java.security.PrivilegedActionException;
@@ -29,8 +29,8 @@ import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.codec.Base64;
-import org.springframework.security.extensions.kerberos.KerberosTicketValidator.KerberosTicketValidation;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.KerberosTicketValidator.KerberosTicketValidation;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
 
 /**
  * <p>Holds the Kerberos/SPNEGO token for requesting a kerberized service and is
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosTicketValidator.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosTicketValidator.java
similarity index 97%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosTicketValidator.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosTicketValidator.java
index cfc4331..21198dd 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosTicketValidator.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/KerberosTicketValidator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import java.util.HashSet;
 
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/SunJaasKerberosClient.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/SunJaasKerberosClient.java
similarity index 98%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/SunJaasKerberosClient.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/SunJaasKerberosClient.java
index 667caba..b2e7d90 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/SunJaasKerberosClient.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/SunJaasKerberosClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/SunJaasKerberosTicketValidator.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/SunJaasKerberosTicketValidator.java
similarity index 99%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/SunJaasKerberosTicketValidator.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/SunJaasKerberosTicketValidator.java
index facb3bc..d90d01a 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/SunJaasKerberosTicketValidator.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/SunJaasKerberosTicketValidator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import java.security.Principal;
 import java.security.PrivilegedActionException;
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java
similarity index 91%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java
index 7b02a16..0aec6af 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/ResponseHeaderSettingKerberosAuthenticationSuccessHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.web;
+package org.springframework.security.kerberos.web;
 
 import java.io.IOException;
 
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.core.Authentication;
-import org.springframework.security.extensions.kerberos.KerberosServiceRequestToken;
+import org.springframework.security.kerberos.KerberosServiceRequestToken;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 
 /**
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/SpnegoAuthenticationProcessingFilter.java
similarity index 94%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/SpnegoAuthenticationProcessingFilter.java
index 39a25aa..6b786b9 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/SpnegoAuthenticationProcessingFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.web;
+package org.springframework.security.kerberos.web;
 
 import java.io.IOException;
 
@@ -31,8 +31,8 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.codec.Base64;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.KerberosServiceRequestToken;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.KerberosServiceRequestToken;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
@@ -59,10 +59,10 @@ import org.springframework.web.filter.GenericFilterBean;
  * 	&lt;sec:custom-filter ref=&quot;spnegoAuthenticationProcessingFilter&quot; position=&quot;BASIC_AUTH_FILTER&quot; /&gt;
  * &lt;/sec:http&gt;
  *
- * &lt;bean id=&quot;spnegoEntryPoint&quot; class=&quot;org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint&quot; /&gt;
+ * &lt;bean id=&quot;spnegoEntryPoint&quot; class=&quot;org.springframework.security.kerberos.web.SpnegoEntryPoint&quot; /&gt;
  *
  * &lt;bean id=&quot;spnegoAuthenticationProcessingFilter&quot;
- * 	class=&quot;org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter&quot;&gt;
+ * 	class=&quot;org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter&quot;&gt;
  * 	&lt;property name=&quot;authenticationManager&quot; ref=&quot;authenticationManager&quot; /&gt;
  * &lt;/bean&gt;
  *
@@ -71,9 +71,9 @@ import org.springframework.web.filter.GenericFilterBean;
  * &lt;/sec:authentication-manager&gt;
  *
  * &lt;bean id=&quot;kerberosServiceAuthenticationProvider&quot;
- * 	class=&quot;org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider&quot;&gt;
+ * 	class=&quot;org.springframework.security.kerberos.KerberosServiceAuthenticationProvider&quot;&gt;
  * 	&lt;property name=&quot;ticketValidator&quot;&gt;
- * 		&lt;bean class=&quot;org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator&quot;&gt;
+ * 		&lt;bean class=&quot;org.springframework.security.kerberos.SunJaasKerberosTicketValidator&quot;&gt;
  * 			&lt;property name=&quot;servicePrincipal&quot; value=&quot;HTTP/web.springsource.com&quot; /&gt;
  * 			&lt;property name=&quot;keyTabLocation&quot; value=&quot;classpath:http-java.keytab&quot; /&gt;
  * 		&lt;/bean&gt;
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoEntryPoint.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/SpnegoEntryPoint.java
similarity index 98%
rename from spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoEntryPoint.java
rename to spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/SpnegoEntryPoint.java
index 777b13b..0eb52df 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoEntryPoint.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/kerberos/web/SpnegoEntryPoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.web;
+package org.springframework.security.kerberos.web;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.xml b/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.xml
deleted file mode 100644
index 82d79f2..0000000
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- tag::snippetA[] -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:sec="http://www.springframework.org/schema/security"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
-
-  <sec:http use-expressions="true" >
-    <sec:intercept-url pattern="/" access="permitAll" />
-    <sec:intercept-url pattern="/home" access="permitAll" />
-    <sec:intercept-url pattern="/**" access="authenticated"/>
-  </sec:http>
-
-  <sec:authentication-manager alias="authenticationManager">
-    <sec:authentication-provider ref="kerberosAuthenticationProvider"/>
-  </sec:authentication-manager>
-
-  <bean id="kerberosAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider">
-    <property name="kerberosClient">
-      <bean class="org.springframework.security.extensions.kerberos.SunJaasKerberosClient">
-        <property name="debug" value="true"/>
-      </bean>
-    </property>
-    <property name="userDetailsService" ref="dummyUserDetailsService"/>
-  </bean>
-
-  <bean
-    class="org.springframework.security.extensions.kerberos.GlobalSunJaasKerberosConfig">
-    <property name="debug" value="true" />
-    <property name="krbConfLocation" value="/path/to/krb5.ini"/>
-  </bean>
-
-  <bean id="dummyUserDetailsService"
-    class="org.springframework.security.extensions.kerberos.sample.DummyUserDetailsService" />
-
-</beans>
-<!-- end::snippetA[] -->
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.xml b/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.xml
deleted file mode 100644
index a846a19..0000000
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- tag::snippetA[] -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:sec="http://www.springframework.org/schema/security"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-  <sec:http entry-point-ref="spnegoEntryPoint" use-expressions="true" >
-    <sec:intercept-url pattern="/" access="permitAll" />
-    <sec:intercept-url pattern="/home" access="permitAll" />
-    <sec:intercept-url pattern="/login" access="permitAll" />
-    <sec:intercept-url pattern="/**" access="authenticated"/>
-    <sec:form-login login-page="/login" />
-    <sec:custom-filter ref="spnegoAuthenticationProcessingFilter"
-      before="BASIC_AUTH_FILTER" />
-  </sec:http>
-
-  <sec:authentication-manager alias="authenticationManager">
-    <sec:authentication-provider ref="kerberosAuthenticationProvider" />
-    <sec:authentication-provider ref="kerberosServiceAuthenticationProvider" />
-  </sec:authentication-manager>
-
-  <bean id="kerberosAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider">
-    <property name="userDetailsService" ref="dummyUserDetailsService"/>
-    <property name="kerberosClient">
-      <bean class="org.springframework.security.extensions.kerberos.SunJaasKerberosClient">
-        <property name="debug" value="true"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="spnegoEntryPoint"
-    class="org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint" >
-    <constructor-arg value="/login" />
-  </bean>
-
-  <bean id="spnegoAuthenticationProcessingFilter"
-    class="org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter">
-    <property name="authenticationManager" ref="authenticationManager" />
-  </bean>
-
-  <bean id="kerberosServiceAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider">
-    <property name="ticketValidator">
-      <bean
-        class="org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator">
-        <property name="servicePrincipal" value="${app.service-principal}" />
-        <property name="keyTabLocation" value="${app.keytab-location}" />
-        <property name="debug" value="true" />
-      </bean>
-    </property>
-    <property name="userDetailsService" ref="dummyUserDetailsService" />
-  </bean>
-
-  <bean id="dummyUserDetailsService"
-    class="org.springframework.security.extensions.kerberos.docs.DummyUserDetailsService" />
-
-</beans>
-<!-- end::snippetA[] -->
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/KerberosAuthenticationProviderTest.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/KerberosAuthenticationProviderTest.java
similarity index 94%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/KerberosAuthenticationProviderTest.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/KerberosAuthenticationProviderTest.java
index 26bb677..0a92beb 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/KerberosAuthenticationProviderTest.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/KerberosAuthenticationProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -29,6 +29,8 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.kerberos.KerberosAuthenticationProvider;
+import org.springframework.security.kerberos.KerberosClient;
 
 /**
  * Test class for {@link KerberosAuthenticationProvider}
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/KerberosServiceAuthenticationProviderTest.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/KerberosServiceAuthenticationProviderTest.java
similarity index 94%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/KerberosServiceAuthenticationProviderTest.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/KerberosServiceAuthenticationProviderTest.java
index 9f871d4..9987e73 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/KerberosServiceAuthenticationProviderTest.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/KerberosServiceAuthenticationProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos;
+package org.springframework.security.kerberos;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -34,7 +34,10 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.extensions.kerberos.KerberosTicketValidator.KerberosTicketValidation;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.KerberosServiceRequestToken;
+import org.springframework.security.kerberos.KerberosTicketValidator;
+import org.springframework.security.kerberos.KerberosTicketValidator.KerberosTicketValidation;
 
 /**
  * Test class for {@link KerberosServiceAuthenticationProvider}
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/AuthProviderConfig.java
similarity index 91%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/AuthProviderConfig.java
index 9e9767d..619dcbf 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/AuthProviderConfig.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/AuthProviderConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.docs;
+package org.springframework.security.kerberos.docs;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,8 +21,8 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosClient;
+import org.springframework.security.kerberos.KerberosAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosClient;
 
 //tag::snippetA[]
 @Configuration
diff --git a/docs/src/reference/asciidoc/samples/AuthProviderConfig.xml b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/AuthProviderConfig.xml
similarity index 80%
rename from docs/src/reference/asciidoc/samples/AuthProviderConfig.xml
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/AuthProviderConfig.xml
index 82d79f2..8499b10 100644
--- a/docs/src/reference/asciidoc/samples/AuthProviderConfig.xml
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/AuthProviderConfig.xml
@@ -20,9 +20,9 @@
   </sec:authentication-manager>
 
   <bean id="kerberosAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider">
+    class="org.springframework.security.kerberos.KerberosAuthenticationProvider">
     <property name="kerberosClient">
-      <bean class="org.springframework.security.extensions.kerberos.SunJaasKerberosClient">
+      <bean class="org.springframework.security.kerberos.SunJaasKerberosClient">
         <property name="debug" value="true"/>
       </bean>
     </property>
@@ -30,13 +30,13 @@
   </bean>
 
   <bean
-    class="org.springframework.security.extensions.kerberos.GlobalSunJaasKerberosConfig">
+    class="org.springframework.security.kerberos.GlobalSunJaasKerberosConfig">
     <property name="debug" value="true" />
     <property name="krbConfLocation" value="/path/to/krb5.ini"/>
   </bean>
 
   <bean id="dummyUserDetailsService"
-    class="org.springframework.security.extensions.kerberos.sample.DummyUserDetailsService" />
+    class="org.springframework.security.kerberos.sample.DummyUserDetailsService" />
 
 </beans>
 <!-- end::snippetA[] -->
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/DummyUserDetailsService.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/DummyUserDetailsService.java
similarity index 95%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/DummyUserDetailsService.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/DummyUserDetailsService.java
index 66bbae0..e92ff90 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/DummyUserDetailsService.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/DummyUserDetailsService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.docs;
+package org.springframework.security.kerberos.docs;
 
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/SpnegoConfig.java
similarity index 88%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/SpnegoConfig.java
index 816546a..d512c0e 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/docs/SpnegoConfig.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/SpnegoConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.docs;
+package org.springframework.security.kerberos.docs;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -23,12 +23,12 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosClient;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
-import org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint;
+import org.springframework.security.kerberos.KerberosAuthenticationProvider;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosClient;
+import org.springframework.security.kerberos.SunJaasKerberosTicketValidator;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 //tag::snippetA[]
diff --git a/docs/src/reference/asciidoc/samples/SpnegoConfig.xml b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/SpnegoConfig.xml
similarity index 77%
rename from docs/src/reference/asciidoc/samples/SpnegoConfig.xml
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/SpnegoConfig.xml
index a846a19..e4ac737 100644
--- a/docs/src/reference/asciidoc/samples/SpnegoConfig.xml
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/docs/SpnegoConfig.xml
@@ -24,30 +24,30 @@
   </sec:authentication-manager>
 
   <bean id="kerberosAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider">
+    class="org.springframework.security.kerberos.KerberosAuthenticationProvider">
     <property name="userDetailsService" ref="dummyUserDetailsService"/>
     <property name="kerberosClient">
-      <bean class="org.springframework.security.extensions.kerberos.SunJaasKerberosClient">
+      <bean class="org.springframework.security.kerberos.SunJaasKerberosClient">
         <property name="debug" value="true"/>
       </bean>
     </property>
   </bean>
 
   <bean id="spnegoEntryPoint"
-    class="org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint" >
+    class="org.springframework.security.kerberos.web.SpnegoEntryPoint" >
     <constructor-arg value="/login" />
   </bean>
 
   <bean id="spnegoAuthenticationProcessingFilter"
-    class="org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter">
+    class="org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter">
     <property name="authenticationManager" ref="authenticationManager" />
   </bean>
 
   <bean id="kerberosServiceAuthenticationProvider"
-    class="org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider">
+    class="org.springframework.security.kerberos.KerberosServiceAuthenticationProvider">
     <property name="ticketValidator">
       <bean
-        class="org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator">
+        class="org.springframework.security.kerberos.SunJaasKerberosTicketValidator">
         <property name="servicePrincipal" value="${app.service-principal}" />
         <property name="keyTabLocation" value="${app.keytab-location}" />
         <property name="debug" value="true" />
@@ -57,7 +57,7 @@
   </bean>
 
   <bean id="dummyUserDetailsService"
-    class="org.springframework.security.extensions.kerberos.docs.DummyUserDetailsService" />
+    class="org.springframework.security.kerberos.docs.DummyUserDetailsService" />
 
 </beans>
 <!-- end::snippetA[] -->
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java
similarity index 96%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java
index f77887d..5aa76da 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/web/SpnegoAuthenticationProcessingFilterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.web;
+package org.springframework.security.kerberos.web;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -43,8 +43,9 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.extensions.kerberos.KerberosServiceRequestToken;
-import org.springframework.security.extensions.kerberos.KerberosTicketValidator.KerberosTicketValidation;
+import org.springframework.security.kerberos.KerberosServiceRequestToken;
+import org.springframework.security.kerberos.KerberosTicketValidator.KerberosTicketValidation;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
diff --git a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/web/SpnegoEntryPointTest.java b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/web/SpnegoEntryPointTest.java
similarity index 96%
rename from spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/web/SpnegoEntryPointTest.java
rename to spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/web/SpnegoEntryPointTest.java
index 374c902..508542f 100644
--- a/spring-security-kerberos-core/src/test/java/org/springframework/security/extensions/kerberos/web/SpnegoEntryPointTest.java
+++ b/spring-security-kerberos-core/src/test/java/org/springframework/security/kerberos/web/SpnegoEntryPointTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.web;
+package org.springframework.security.kerberos.web;
 
 import org.junit.Test;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
diff --git a/spring-security-kerberos-samples/sec-client-rest-template/src/main/java/demo/app/Application.java b/spring-security-kerberos-samples/sec-client-rest-template/src/main/java/demo/app/Application.java
index d871122..ea6a4ae 100644
--- a/spring-security-kerberos-samples/sec-client-rest-template/src/main/java/demo/app/Application.java
+++ b/spring-security-kerberos-samples/sec-client-rest-template/src/main/java/demo/app/Application.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.security.extensions.kerberos.client.KerberosRestTemplate;
+import org.springframework.security.kerberos.client.KerberosRestTemplate;
 
 @SpringBootApplication
 @EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
diff --git a/spring-security-kerberos-samples/sec-server-client-auth/src/main/java/demo/app/WebSecurityConfig.java b/spring-security-kerberos-samples/sec-server-client-auth/src/main/java/demo/app/WebSecurityConfig.java
index 167ffe8..ed9b073 100644
--- a/spring-security-kerberos-samples/sec-server-client-auth/src/main/java/demo/app/WebSecurityConfig.java
+++ b/spring-security-kerberos-samples/sec-server-client-auth/src/main/java/demo/app/WebSecurityConfig.java
@@ -6,8 +6,8 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosClient;
+import org.springframework.security.kerberos.KerberosAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosClient;
 
 import demo.DummyUserDetailsService;
 
diff --git a/spring-security-kerberos-samples/sec-server-spnego-form-auth-xml/src/main/resources/websecurityconfig.xml b/spring-security-kerberos-samples/sec-server-spnego-form-auth-xml/src/main/resources/websecurityconfig.xml
index d5e8cdc..43dbacd 100644
--- a/spring-security-kerberos-samples/sec-server-spnego-form-auth-xml/src/main/resources/websecurityconfig.xml
+++ b/spring-security-kerberos-samples/sec-server-spnego-form-auth-xml/src/main/resources/websecurityconfig.xml
@@ -23,30 +23,30 @@
 	</sec:authentication-manager>
 
 	<bean id="kerberosAuthenticationProvider"
-		class="org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider">
+		class="org.springframework.security.kerberos.KerberosAuthenticationProvider">
 		<property name="userDetailsService" ref="dummyUserDetailsService"/>
 		<property name="kerberosClient">
-			<bean class="org.springframework.security.extensions.kerberos.SunJaasKerberosClient">
+			<bean class="org.springframework.security.kerberos.SunJaasKerberosClient">
 				<property name="debug" value="true"/>
 			</bean>
 		</property>
 	</bean>
 
 	<bean id="spnegoEntryPoint"
-		class="org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint" >
+		class="org.springframework.security.kerberos.web.SpnegoEntryPoint" >
 		<constructor-arg value="/login" />
 	</bean>
 
 	<bean id="spnegoAuthenticationProcessingFilter"
-		class="org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter">
+		class="org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter">
 		<property name="authenticationManager" ref="authenticationManager" />
 	</bean>
 
 	<bean id="kerberosServiceAuthenticationProvider"
-		class="org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider">
+		class="org.springframework.security.kerberos.KerberosServiceAuthenticationProvider">
 		<property name="ticketValidator">
 			<bean
-				class="org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator">
+				class="org.springframework.security.kerberos.SunJaasKerberosTicketValidator">
 				<property name="servicePrincipal" value="${app.service-principal}" />
 				<property name="keyTabLocation" value="${app.keytab-location}" />
 				<property name="debug" value="true" />
diff --git a/spring-security-kerberos-samples/sec-server-spnego-form-auth/src/main/java/demo/app/WebSecurityConfig.java b/spring-security-kerberos-samples/sec-server-spnego-form-auth/src/main/java/demo/app/WebSecurityConfig.java
index 9c00811..203afb5 100644
--- a/spring-security-kerberos-samples/sec-server-spnego-form-auth/src/main/java/demo/app/WebSecurityConfig.java
+++ b/spring-security-kerberos-samples/sec-server-spnego-form-auth/src/main/java/demo/app/WebSecurityConfig.java
@@ -9,12 +9,12 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.extensions.kerberos.KerberosAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosClient;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
-import org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint;
+import org.springframework.security.kerberos.KerberosAuthenticationProvider;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosClient;
+import org.springframework.security.kerberos.SunJaasKerberosTicketValidator;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 import demo.DummyUserDetailsService;
diff --git a/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java b/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java
index 544ebd7..7c434b7 100644
--- a/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java
+++ b/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java
@@ -9,12 +9,12 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
-import org.springframework.security.extensions.kerberos.SunJaasKerberosTicketValidator;
-import org.springframework.security.extensions.kerberos.client.KerberosLdapContextSource;
-import org.springframework.security.extensions.kerberos.client.config.SunJaasKrb5LoginConfig;
-import org.springframework.security.extensions.kerberos.web.SpnegoAuthenticationProcessingFilter;
-import org.springframework.security.extensions.kerberos.web.SpnegoEntryPoint;
+import org.springframework.security.kerberos.KerberosServiceAuthenticationProvider;
+import org.springframework.security.kerberos.SunJaasKerberosTicketValidator;
+import org.springframework.security.kerberos.client.KerberosLdapContextSource;
+import org.springframework.security.kerberos.client.config.SunJaasKrb5LoginConfig;
+import org.springframework.security.kerberos.web.SpnegoAuthenticationProcessingFilter;
+import org.springframework.security.kerberos.web.SpnegoEntryPoint;
 import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
diff --git a/spring-security-kerberos-test/src/main/java/org/springframework/security/extensions/kerberos/test/KerberosSecurityTestcase.java b/spring-security-kerberos-test/src/main/java/org/springframework/security/kerberos/test/KerberosSecurityTestcase.java
similarity index 96%
rename from spring-security-kerberos-test/src/main/java/org/springframework/security/extensions/kerberos/test/KerberosSecurityTestcase.java
rename to spring-security-kerberos-test/src/main/java/org/springframework/security/kerberos/test/KerberosSecurityTestcase.java
index d994a9a..e9b3f04 100644
--- a/spring-security-kerberos-test/src/main/java/org/springframework/security/extensions/kerberos/test/KerberosSecurityTestcase.java
+++ b/spring-security-kerberos-test/src/main/java/org/springframework/security/kerberos/test/KerberosSecurityTestcase.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.test;
+package org.springframework.security.kerberos.test;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/spring-security-kerberos-test/src/main/java/org/springframework/security/extensions/kerberos/test/MiniKdc.java b/spring-security-kerberos-test/src/main/java/org/springframework/security/kerberos/test/MiniKdc.java
similarity index 99%
rename from spring-security-kerberos-test/src/main/java/org/springframework/security/extensions/kerberos/test/MiniKdc.java
rename to spring-security-kerberos-test/src/main/java/org/springframework/security/kerberos/test/MiniKdc.java
index 79a6ee3..a71a0f5 100644
--- a/spring-security-kerberos-test/src/main/java/org/springframework/security/extensions/kerberos/test/MiniKdc.java
+++ b/spring-security-kerberos-test/src/main/java/org/springframework/security/kerberos/test/MiniKdc.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.test;
+package org.springframework.security.kerberos.test;
 
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FileUtils;
diff --git a/spring-security-kerberos-test/src/test/java/org/springframework/security/extensions/kerberos/test/TestMiniKdc.java b/spring-security-kerberos-test/src/test/java/org/springframework/security/kerberos/test/TestMiniKdc.java
similarity index 96%
rename from spring-security-kerberos-test/src/test/java/org/springframework/security/extensions/kerberos/test/TestMiniKdc.java
rename to spring-security-kerberos-test/src/test/java/org/springframework/security/kerberos/test/TestMiniKdc.java
index 02085cf..ea2cb63 100644
--- a/spring-security-kerberos-test/src/test/java/org/springframework/security/extensions/kerberos/test/TestMiniKdc.java
+++ b/spring-security-kerberos-test/src/test/java/org/springframework/security/kerberos/test/TestMiniKdc.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.extensions.kerberos.test;
+package org.springframework.security.kerberos.test;
 
 import org.apache.directory.server.kerberos.shared.keytab.Keytab;
 import org.apache.directory.server.kerberos.shared.keytab.KeytabEntry;
 import org.junit.Assert;
 import org.junit.Test;
-import org.springframework.security.extensions.kerberos.test.KerberosSecurityTestcase;
-import org.springframework.security.extensions.kerberos.test.MiniKdc;
+import org.springframework.security.kerberos.test.KerberosSecurityTestcase;
+import org.springframework.security.kerberos.test.MiniKdc;
 
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosPrincipal;