diff --git a/cas/cas/.cvsignore b/cas/cas-adapter/.cvsignore
similarity index 100%
rename from cas/cas/.cvsignore
rename to cas/cas-adapter/.cvsignore
diff --git a/cas/cas/pom.xml b/cas/cas-adapter/pom.xml
similarity index 88%
rename from cas/cas/pom.xml
rename to cas/cas-adapter/pom.xml
index ee07a5e094..b31ede8ac2 100644
--- a/cas/cas/pom.xml
+++ b/cas/cas-adapter/pom.xml
@@ -18,6 +18,11 @@
       <artifactId>cas</artifactId>
       <version>2.0.12</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-mock</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
diff --git a/cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java b/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
similarity index 100%
rename from cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
rename to cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
diff --git a/cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java b/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
similarity index 100%
rename from cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
rename to cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
diff --git a/cas/cas/src/main/java/org/springframework/security/adapters/cas/package.html b/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas/package.html
similarity index 100%
rename from cas/cas/src/main/java/org/springframework/security/adapters/cas/package.html
rename to cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas/package.html
diff --git a/cas/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java b/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
similarity index 100%
rename from cas/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
rename to cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
diff --git a/cas/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml b/cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
similarity index 100%
rename from cas/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
rename to cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
diff --git a/cas/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml b/cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
similarity index 100%
rename from cas/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
rename to cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
diff --git a/cas/cas/src/main/site/site.xml b/cas/cas-adapter/src/main/site/site.xml
similarity index 100%
rename from cas/cas/src/main/site/site.xml
rename to cas/cas-adapter/src/main/site/site.xml
diff --git a/cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java b/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
similarity index 100%
rename from cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
rename to cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
diff --git a/cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java b/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
similarity index 100%
rename from cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
rename to cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
diff --git a/cas/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java b/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
similarity index 100%
rename from cas/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
rename to cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
diff --git a/cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml b/cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
similarity index 100%
rename from cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
rename to cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
diff --git a/cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml b/cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml
similarity index 100%
rename from cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml
rename to cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml