diff --git a/cas/cas-client/pom.xml b/cas/cas-client/pom.xml
index 6ad93604c3..aef8fc815c 100644
--- a/cas/cas-client/pom.xml
+++ b/cas/cas-client/pom.xml
@@ -18,5 +18,10 @@
             <artifactId>spring-security-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <optional>true</optional>
+        </dependency>        
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java
rename to cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java
diff --git a/core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java
rename to cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java
diff --git a/core/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java
rename to cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java
diff --git a/core/src/main/java/org/springframework/security/ui/cas/package.html b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/ui/cas/package.html
rename to cas/cas-client/src/main/java/org/springframework/security/ui/cas/package.html
diff --git a/core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java b/cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java
rename to cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java
diff --git a/core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java b/cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java
rename to cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java
diff --git a/core/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java b/cas/cas-client/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java
rename to cas/cas-client/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java