diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/GrantType.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java
similarity index 90%
rename from redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/GrantType.java
rename to redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java
index 200dc75f..63c362af 100644
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/GrantType.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java
@@ -57,9 +57,6 @@ public enum GrantType
     @Override
     public String toString( )
     {
-        final StringBuilder sb = new StringBuilder( "GrantType{" );
-        sb.append( "label='" ).append( label ).append( '\'' );
-        sb.append( '}' );
-        return sb.toString( );
+        return this.label;
     }
 }
diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/resources/openapi-configuration.yaml b/redback-integrations/redback-rest/redback-rest-api/src/main/resources/redback/openapi-configuration.yaml
similarity index 100%
rename from redback-integrations/redback-rest/redback-rest-api/src/main/resources/openapi-configuration.yaml
rename to redback-integrations/redback-rest/redback-rest-api/src/main/resources/redback/openapi-configuration.yaml