diff --git a/openid-connect-server/src/main/java/org/mitre/uma/service/MatchAllClaimsProcessor.java b/openid-connect-server/src/main/java/org/mitre/uma/service/impl/MatchAllClaimsProcessor.java
similarity index 95%
rename from openid-connect-server/src/main/java/org/mitre/uma/service/MatchAllClaimsProcessor.java
rename to openid-connect-server/src/main/java/org/mitre/uma/service/impl/MatchAllClaimsProcessor.java
index f68650365..3455279de 100644
--- a/openid-connect-server/src/main/java/org/mitre/uma/service/MatchAllClaimsProcessor.java
+++ b/openid-connect-server/src/main/java/org/mitre/uma/service/impl/MatchAllClaimsProcessor.java
@@ -15,12 +15,13 @@
  * limitations under the License.
  *******************************************************************************/
 
-package org.mitre.uma.service;
+package org.mitre.uma.service.impl;
 
 import java.util.Collection;
 import java.util.HashSet;
 
 import org.mitre.uma.model.Claim;
+import org.mitre.uma.service.ClaimsProcessingService;
 import org.springframework.stereotype.Service;
 
 /**