diff --git a/server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java b/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java
similarity index 100%
rename from server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java
rename to model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java
diff --git a/server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java b/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java
similarity index 100%
rename from server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java
rename to model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java
diff --git a/server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java b/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java
similarity index 100%
rename from server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java
rename to model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java
diff --git a/server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java b/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java
similarity index 100%
rename from server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java
rename to model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java
diff --git a/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi
index 4bf3554e7c..21ae0fad9e 100644
--- a/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ b/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi
@@ -19,3 +19,4 @@ org.keycloak.models.cache.CacheUserProviderSpi
 org.keycloak.models.cache.CacheRealmProviderSpi
 org.keycloak.storage.client.ClientStorageProviderSpi
 org.keycloak.storage.group.GroupStorageProviderSpi
+org.keycloak.storage.clientscope.ClientScopeStorageProviderSpi
diff --git a/server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi
index d5e0d7b318..b489f28cae 100755
--- a/server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ b/server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi
@@ -78,7 +78,6 @@ org.keycloak.credential.CredentialSpi
 org.keycloak.keys.PublicKeyStorageSpi
 org.keycloak.keys.KeySpi
 org.keycloak.storage.DatastoreSpi
-org.keycloak.storage.clientscope.ClientScopeStorageProviderSpi
 org.keycloak.storage.role.RoleStorageProviderSpi
 org.keycloak.crypto.SignatureSpi
 org.keycloak.crypto.ClientSignatureVerifierSpi