diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
similarity index 96%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java
rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
index f39a219a..896ade57 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization.rbac;
+package org.apache.archiva.redback.authorization.rbac;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,8 +28,8 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
 import org.apache.archiva.redback.authorization.AuthorizationResult;
 import org.apache.archiva.redback.authorization.Authorizer;
 import org.apache.archiva.redback.authorization.NotAuthorizedException;
-import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluationException;
-import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluator;
+import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluationException;
+import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluator;
 import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
similarity index 98%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
index 39ab53c8..9947ea86 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization.rbac.evaluator;
+package org.apache.archiva.redback.authorization.rbac.evaluator;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
similarity index 94%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
index 92e7652a..6b0380f4 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization.rbac.evaluator;
+package org.apache.archiva.redback.authorization.rbac.evaluator;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
similarity index 94%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java
rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
index 922be0c2..f6423150 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization.rbac.evaluator;
+package org.apache.archiva.redback.authorization.rbac.evaluator;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml
index 26062d5f..9a306403 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,6 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.authorization.rbac"/>
+    base-package="org.apache.archiva.redback.authorization.rbac"/>
  
 </beans>
\ No newline at end of file
diff --git a/redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java b/redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
similarity index 91%
rename from redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
rename to redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
index d96636da..ef678971 100644
--- a/redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
+++ b/redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization.rbac.evaluator;
+package org.apache.archiva.redback.authorization.rbac.evaluator;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@ package org.codehaus.plexus.redback.authorization.rbac.evaluator;
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluationException;
+import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluator;
 import org.apache.archiva.redback.rbac.Permission;
 import org.apache.archiva.redback.rbac.Operation;
 import org.apache.archiva.redback.rbac.Resource;