diff --git a/server-spi-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java b/model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java
similarity index 100%
rename from server-spi-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java
rename to model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java
diff --git a/server-spi-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java b/model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java
similarity index 100%
rename from server-spi-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java
rename to model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.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 511cd93eb5..4bf3554e7c 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
@@ -18,3 +18,4 @@
 org.keycloak.models.cache.CacheUserProviderSpi
 org.keycloak.models.cache.CacheRealmProviderSpi
 org.keycloak.storage.client.ClientStorageProviderSpi
+org.keycloak.storage.group.GroupStorageProviderSpi
diff --git a/server-spi/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java b/model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java
similarity index 100%
rename from server-spi/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java
rename to model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java
diff --git a/server-spi/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java b/model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java
similarity index 100%
rename from server-spi/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java
rename to model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java
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 9c3ce1a594..d5e0d7b318 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
@@ -80,7 +80,6 @@ org.keycloak.keys.KeySpi
 org.keycloak.storage.DatastoreSpi
 org.keycloak.storage.clientscope.ClientScopeStorageProviderSpi
 org.keycloak.storage.role.RoleStorageProviderSpi
-org.keycloak.storage.group.GroupStorageProviderSpi
 org.keycloak.crypto.SignatureSpi
 org.keycloak.crypto.ClientSignatureVerifierSpi
 org.keycloak.crypto.HashSpi