diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/HttpUtils.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/HttpUtils.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
index 5799ffba..c5b52013 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/HttpUtils.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration;
+package org.apache.archiva.redback.integration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
index f2683174..5c8fc95f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks;
+package org.apache.archiva.redback.integration.checks;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
similarity index 99%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
index 65267bc5..3a06e1a8 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks.security;
+package org.apache.archiva.redback.integration.checks.security;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
index 28473407..70ba670a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks.security;
+package org.apache.archiva.redback.integration.checks.security;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
index 15aa7ed1..36ad8562 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks.security;
+package org.apache.archiva.redback.integration.checks.security;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@ import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.UserAssignment;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
index 0fbd1eb9..e6d5707a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks.security;
+package org.apache.archiva.redback.integration.checks.security;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkActionConfig.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkActionConfig.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
index f5495402..9499a589 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkActionConfig.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks.xwork;
+package org.apache.archiva.redback.integration.checks.xwork;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkPackageConfig.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkPackageConfig.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
index 256db29e..b49afc5a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkPackageConfig.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.checks.xwork;
+package org.apache.archiva.redback.integration.checks.xwork;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/CheckboxImageCell.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/CheckboxImageCell.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
index 4534a8b4..3530607c 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/CheckboxImageCell.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.eXc;
+package org.apache.archiva.redback.integration.eXc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/MailtoCell.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/MailtoCell.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
index 713f3c61..b51966ba 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/MailtoCell.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.eXc;
+package org.apache.archiva.redback.integration.eXc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/ProcessUserRowsCallback.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
similarity index 94%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/ProcessUserRowsCallback.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
index 3f92c886..eae448ae 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/ProcessUserRowsCallback.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.eXc;
+package org.apache.archiva.redback.integration.eXc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.codehaus.redback.integration.util.UserComparator;
+import org.apache.archiva.redback.integration.util.UserComparator;
 import org.extremecomponents.table.callback.ProcessRowsCallback;
 import org.extremecomponents.table.core.TableConstants;
 import org.extremecomponents.table.core.TableModel;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/SecurityFilterCell.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/SecurityFilterCell.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
index 9501d73a..cb27063a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/SecurityFilterCell.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.eXc;
+package org.apache.archiva.redback.integration.eXc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityToolbar.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityToolbar.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
index 1deaf47b..ac95f8bc 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityToolbar.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.eXc.views;
+package org.apache.archiva.redback.integration.eXc.views;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityView.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityView.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
index 630d2f73..729866d1 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityView.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.eXc.views;
+package org.apache.archiva.redback.integration.eXc.views;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/SpringServletFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/SpringServletFilter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
index 0ebfd2d2..8c5a2c5c 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/SpringServletFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter;
+package org.apache.archiva.redback.integration.filter;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
similarity index 91%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
index 72e230d0..4be9cc5a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication;
+package org.apache.archiva.redback.integration.filter.authentication;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.codehaus.redback.integration.filter.authentication;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 
-import org.codehaus.redback.integration.filter.SpringServletFilter;
+import org.apache.archiva.redback.integration.filter.SpringServletFilter;
 
 /**
  * AbstractHttpAuthenticationFilter
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
index 61b2e3f8..c087ef69 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication;
+package org.apache.archiva.redback.integration.filter.authentication;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
similarity index 99%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
index 0453ad3a..4e1b97f5 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication;
+package org.apache.archiva.redback.integration.filter.authentication;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
index 42565b50..4fb4e8c2 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.basic;
+package org.apache.archiva.redback.integration.filter.authentication.basic;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,7 @@ import org.apache.archiva.redback.authentication.AuthenticationResult;
 import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
similarity index 91%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
index 459e399d..0bef4e5e 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.basic;
+package org.apache.archiva.redback.integration.filter.authentication.basic;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.codehaus.redback.integration.filter.authentication.basic;
  */
 
 import org.apache.archiva.redback.authentication.AuthenticationException;
-import org.codehaus.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Digest.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Digest.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
index 7f089e76..750541a2 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Digest.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Hex.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Hex.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
index fba7f267..1d8c9b26 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Hex.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
index 5b57ca3e..0bb1ac30 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,8 +29,8 @@ import org.apache.archiva.redback.policy.AccountLockedException;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
similarity index 89%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
index 02ccad01..69a7b351 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@ package org.codehaus.redback.integration.filter.authentication.digest;
  */
 
 import org.apache.archiva.redback.authentication.AuthenticationException;
-import org.codehaus.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
-import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
+import org.apache.archiva.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
 
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestHeader.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestHeader.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
index aecaf0ee..dc999bac 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestHeader.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@ package org.codehaus.redback.integration.filter.authentication.digest;
 
 import org.apache.commons.codec.binary.Base64;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.HttpUtils;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException;
+import org.apache.archiva.redback.integration.HttpUtils;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Scope;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/NonceExpirationException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
similarity index 88%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/NonceExpirationException.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
index 144a99ee..c143c2e2 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/NonceExpirationException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration.filter.authentication.digest;
  * under the License.
  */
 
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
 
 /**
  * NonceExpirationException
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
index 64c5eefc..7523d4f4 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authorization;
+package org.apache.archiva.redback.integration.filter.authorization;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.filter.SpringServletFilter;
+import org.apache.archiva.redback.integration.filter.SpringServletFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
index e590848b..c6546cbb 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.interceptor;
+package org.apache.archiva.redback.integration.interceptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java
index 4e818e53..96563eab 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.interceptor;
+package org.apache.archiva.redback.integration.interceptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java
index 7ca8f411..6d0ec888 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.interceptor;
+package org.apache.archiva.redback.integration.interceptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
index 84725829..52554099 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
index 04aff225..b4aa023c 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
index 2dd587a2..2ed4a4fd 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
index c714d156..ab298b08 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
index 19a8bd95..7b628406 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
index 5b87bf49..5e7b0784 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
index 801457d0..54cef2bf 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
index f7cc94b5..fdcb8e56 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
similarity index 94%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
index cb89eae3..0986560f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.codehaus.redback.integration.model;
  */
 
 import org.apache.archiva.redback.users.User;
-import org.codehaus.redback.integration.util.DateUtils;
+import org.apache.archiva.redback.integration.util.DateUtils;
 
 /**
  * EditUserCredentials
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
index b9ebcefe..a2944f8a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
index 63913a2d..bb055a14 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/UserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/UserCredentials.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
index f1835e3d..b07edb3a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/UserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
index 3ebb74fd..7fa41cef 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,8 @@ import org.apache.archiva.redback.users.UserManager;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.User;
-import org.codehaus.redback.integration.util.RoleSorter;
-import org.codehaus.redback.integration.util.UserComparator;
+import org.apache.archiva.redback.integration.util.RoleSorter;
+import org.apache.archiva.redback.integration.util.UserComparator;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
index 3ea2f52b..2cc3083d 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.users.UserManager;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.util.UserComparator;
+import org.apache.archiva.redback.integration.util.UserComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
index 0d07571f..5fa1b58f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
similarity index 95%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
index df039744..fa459543 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
index 725d55b1..1adbfe6f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java
index fe154d27..424b9a0b 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.role;
+package org.apache.archiva.redback.integration.role;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
index 2311acc2..bfa4fff9 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
index 688e1eb5..aab577da 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
index 670ffc84..3682ec69 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
similarity index 97%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
index 56bfd936..35ed9723 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
index 6fe1f01e..a2b41de2 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
index 7e22dbbf..13259247 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
similarity index 99%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
index 5ba995b9..9e85ae55 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
index df9e1442..b7e8e91b 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
index 3d457403..1a080bd7 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
index 2f93f283..399326b1 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
index f49678e3..e5387de4 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
index bc53ac57..ae82c681 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
index 8ba8c762..cf752f59 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
index 5e4fb7fa..8ddc364d 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.java
rename to redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
index 0faa0285..b4bf8930 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml b/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml
index 770636d0..9ddd2a6c 100644
--- a/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml
+++ b/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml
@@ -28,7 +28,7 @@
        default-lazy-init="true">
 
   <context:annotation-config />
-  <context:component-scan  base-package="org.codehaus.redback.integration"/>
+  <context:component-scan  base-package="org.apache.archiva.redback.integration"/>
 
   <bean name="velocityEngine#redback" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
     <property name="velocityProperties">
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld b/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld
index 085147a6..3e5910e1 100644
--- a/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld
+++ b/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld
@@ -24,7 +24,7 @@
 
   <tag>
     <name>ifConfigured</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IfConfiguredTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IfConfiguredTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
       <name>option</name>
@@ -40,19 +40,19 @@
 
   <tag>
     <name>isReadOnlyUserManager</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IsReadOnlyUserManagerTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IsReadOnlyUserManagerTag</tag-class>
     <body-content>JSP</body-content>
   </tag>
   
   <tag>
     <name>isNotReadOnlyUserManager</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IsNotReadOnlyUserManagerTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IsNotReadOnlyUserManagerTag</tag-class>
     <body-content>JSP</body-content>
   </tag>
 
   <tag>
     <name>ifAuthorized</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IfAuthorizedTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IfAuthorizedTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
       <name>permission</name>
@@ -68,7 +68,7 @@
   
   <tag>
     <name>ifAnyAuthorized</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IfAnyAuthorizedTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IfAnyAuthorizedTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
       <name>permissions</name>
@@ -84,7 +84,7 @@
 
   <tag>
     <name>elseAuthorized</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.ElseAuthorizedTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.ElseAuthorizedTag</tag-class>
     <body-content>JSP</body-content>
   </tag>
 
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default.properties b/redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default.properties
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default.properties
rename to redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default.properties
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_de.properties b/redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_de.properties
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_de.properties
rename to redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_de.properties
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_en.properties b/redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_en.properties
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_en.properties
rename to redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_en.properties
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_fr.properties b/redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_fr.properties
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_fr.properties
rename to redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_fr.properties
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/integration/mail/template/newAccountValidationEmail.vm b/redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/integration/mail/template/newAccountValidationEmail.vm
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/integration/mail/template/newAccountValidationEmail.vm
rename to redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/integration/mail/template/newAccountValidationEmail.vm
diff --git a/redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/integration/mail/template/passwordResetEmail.vm b/redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/integration/mail/template/passwordResetEmail.vm
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/integration/mail/template/passwordResetEmail.vm
rename to redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/integration/mail/template/passwordResetEmail.vm
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
similarity index 93%
rename from redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.java
rename to redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
index b5b19459..87ab447b 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration;
+package org.apache.archiva.redback.integration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
-import org.codehaus.redback.integration.HttpUtils;
+import org.apache.archiva.redback.integration.HttpUtils;
 
 /**
  * HttpUtilsTest
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/filter/authentication/digest/HexTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
similarity index 94%
rename from redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/filter/authentication/digest/HexTest.java
rename to redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
index 106cdf35..263a5e4b 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/filter/authentication/digest/HexTest.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
similarity index 98%
rename from redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
rename to redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
index d5a3f765..e8f28174 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.codehaus.redback.integration.mail;
 
 import junit.framework.TestCase;
 import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.integration.mail.MailGenerator;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.policy.UserSecurityPolicy;
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
similarity index 96%
rename from redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.java
rename to redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
index a194534d..57f1d199 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-common-integrations/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
similarity index 100%
rename from redback-integrations/redback-common-integrations/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
rename to redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
diff --git a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
index 6fb1a7ec..6067c806 100644
--- a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
@@ -50,7 +50,7 @@
     </property>
   </bean>
 
-  <bean name="mailGenerator#custom-url" class="org.codehaus.redback.integration.mail.VelocityMailGenerator">
+  <bean name="mailGenerator#custom-url" class="org.apache.archiva.redback.integration.mail.VelocityMailGenerator">
     <property name="config" ref="userConfiguration#custom-url"/>
     <property name="velocityEngine" ref="velocityEngine#redback"/>
   </bean>
diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java
index 0b90a3e4..17ed43cc 100644
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java
@@ -1,6 +1,6 @@
 package org.codehaus.redback.rest.api.model;
 
-import org.codehaus.redback.integration.util.DateUtils;
+import org.apache.archiva.redback.integration.util.DateUtils;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
index d6fe1cf4..02a67cb1 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
@@ -30,7 +30,7 @@ import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
 import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.codehaus.redback.rest.api.model.User;
 import org.codehaus.redback.rest.api.services.LoginService;
 import org.codehaus.redback.rest.api.services.RedbackServiceException;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
index 71b3a319..9dbc7fe6 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
@@ -27,7 +27,7 @@ import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.codehaus.redback.rest.api.model.ErrorMessage;
 import org.codehaus.redback.rest.api.services.PasswordService;
 import org.codehaus.redback.rest.api.services.RedbackServiceException;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
index 26c7d138..e75cc9d1 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
@@ -32,9 +32,9 @@ import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.redback.role.model.ModelApplication;
 import org.codehaus.plexus.redback.role.model.ModelRole;
 import org.codehaus.plexus.redback.role.model.ModelTemplate;
-import org.codehaus.redback.integration.model.AdminEditUserCredentials;
+import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
-import org.codehaus.redback.integration.util.RoleSorter;
+import org.apache.archiva.redback.integration.util.RoleSorter;
 import org.codehaus.redback.rest.api.model.Application;
 import org.codehaus.redback.rest.api.model.ApplicationRoles;
 import org.codehaus.redback.rest.api.model.ErrorMessage;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
index 5c7b0660..84259be0 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
@@ -42,8 +42,8 @@ import org.apache.archiva.redback.policy.UserSecurityPolicy;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
-import org.codehaus.redback.integration.mail.Mailer;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.mail.Mailer;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.ErrorMessage;
 import org.codehaus.redback.rest.api.model.Operation;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
index 0a915b20..733389bc 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
@@ -32,8 +32,8 @@ import org.apache.archiva.redback.authorization.RedbackAuthorization;
 import org.apache.archiva.redback.policy.AccountLockedException;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException;
-import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
+import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
 import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
 import org.codehaus.redback.rest.services.RedbackRequestInformation;
 import org.slf4j.Logger;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
index 20421504..9dd3dd57 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
@@ -28,7 +28,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
 import org.apache.archiva.redback.authorization.RedbackAuthorization;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
+import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp b/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp
index bf187075..2a5bf593 100644
--- a/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp
+++ b/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp
@@ -53,8 +53,8 @@
     filterable="true"
     showTitle="false"
     showExports="false"
-    view="org.codehaus.redback.integration.eXc.views.SecurityView" 
-    sortRowsCallback="org.codehaus.redback.integration.eXc.ProcessUserRowsCallback"
+    view="org.apache.archiva.redback.integration.eXc.views.SecurityView"
+    sortRowsCallback="org.apache.archiva.redback.integration.eXc.ProcessUserRowsCallback"
     cellspacing="2"
     cellpadding="3"
     >
@@ -71,7 +71,7 @@
        tooltip="Export Table to Excel format."/>
     <ec:row>          
         <ec:column property="username" title="${username}" 
-        	filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell">
+        	filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell">
           <img src="<c:url value="/images/redback/icon-user.gif"/>" />
           <redback:ifAuthorized permission="user-management-user-edit" resource="${user.username}">
             <s:url id="usereditUrl" action="useredit" includeParams="none">
@@ -92,16 +92,16 @@
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="fullName" title="${fullName}" alias="fullname" 
-        	filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell">
+        	filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell">
           <c:out value="${user.fullName}" />
         </ec:column>
-        <ec:column property="email" title="${email}" cell="org.codehaus.redback.integration.eXc.MailtoCell" 
-        	filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell" />
-        <ec:column property="permanent" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" 
+        <ec:column property="email" title="${email}" cell="org.apache.archiva.redback.integration.eXc.MailtoCell"
+        	filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell" />
+        <ec:column property="permanent" cell="org.apache.archiva.redback.integration.eXc.CheckboxImageCell"
         	style="text-align: center" title="${permanent}" filterable="false"/> <%-- Boolean's can't be filtered --%>
-        <ec:column property="validated" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" 
+        <ec:column property="validated" cell="org.apache.archiva.redback.integration.eXc.CheckboxImageCell"
         	style="text-align: center" title="${validated}" filterable="false"/> <%-- Boolean's can't be filtered --%>
-        <ec:column property="locked" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" 
+        <ec:column property="locked" cell="org.apache.archiva.redback.integration.eXc.CheckboxImageCell"
         	style="text-align: center" title="${locked}" filterable="false"/> <%-- Boolean's can't be filtered --%>
         
         <ec:column title="${tasks}" alias="tasks" sortable="false" filterable="false" styleClass="tasks">
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java
index b57af4c9..aafeb3eb 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java
@@ -27,9 +27,9 @@ import org.apache.archiva.redback.policy.PasswordRuleViolationException;
 import org.apache.archiva.redback.policy.PasswordRuleViolations;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
-import org.codehaus.redback.integration.interceptor.SecureAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.interceptor.SecureAction;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 
 /**
  * AbstractSecurityAction
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
index 6b024075..fbc5df8b 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
@@ -28,9 +28,9 @@ import org.apache.archiva.redback.policy.PasswordRuleViolationException;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.model.UserCredentials;
+import org.apache.archiva.redback.integration.model.UserCredentials;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
-import org.codehaus.redback.integration.util.RoleSorter;
+import org.apache.archiva.redback.integration.util.RoleSorter;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java
index 8954eca7..fa292ce3 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java
@@ -28,9 +28,9 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
 import org.apache.archiva.redback.users.UserManager;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.model.EditUserCredentials;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.model.EditUserCredentials;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
index 9bf8558c..0ea40765 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
@@ -37,9 +37,9 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.util.AutoLoginCookies;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.util.AutoLoginCookies;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java
index 0376213a..b8b8ab5c 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java
@@ -22,9 +22,9 @@ package org.codehaus.plexus.redback.struts2.action;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.SessionMap;
 import org.codehaus.plexus.cache.Cache;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.util.AutoLoginCookies;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.util.AutoLoginCookies;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java
index 3f7014cf..72a0416d 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java
@@ -27,8 +27,8 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
index 6cef8a84..821ec303 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
@@ -28,9 +28,9 @@ import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.User;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.mail.Mailer;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.mail.Mailer;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
index d721b64f..60a4b61e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
@@ -27,10 +27,10 @@ import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.mail.Mailer;
-import org.codehaus.redback.integration.model.CreateUserCredentials;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.mail.Mailer;
+import org.apache.archiva.redback.integration.model.CreateUserCredentials;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
index 534bf57c..10a8fbdf 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
@@ -35,10 +35,10 @@ import org.codehaus.plexus.redback.struts2.action.AuditEvent;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.model.EditUserCredentials;
-import org.codehaus.redback.integration.util.AutoLoginCookies;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.model.EditUserCredentials;
+import org.apache.archiva.redback.integration.util.AutoLoginCookies;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java
index 7d1cfdfb..839e945e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java
@@ -21,9 +21,9 @@ package org.codehaus.plexus.redback.struts2.action.admin;
 
 import org.apache.archiva.redback.rbac.Resource;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java
index 6731f2f5..78428c9b 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java
@@ -33,10 +33,10 @@ import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails;
 import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
 import org.apache.archiva.redback.users.UserManager;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.model.AdminEditUserCredentials;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
index af1d7f28..d1fcfdc0 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
@@ -27,10 +27,10 @@ import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.management.DataManagementTool;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
 import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.redback.integration.interceptor.SecureAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureAction;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
index 409d7039..2b6affde 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
@@ -31,8 +31,8 @@ import org.codehaus.plexus.redback.struts2.action.AuditEvent;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java
index 1fcef5a3..dc01e1b1 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java
@@ -24,10 +24,10 @@ import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.rbac.Resource;
 import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
-import org.codehaus.redback.integration.util.OperationSorter;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.util.OperationSorter;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java
index 17a8722a..284e3c15 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java
@@ -26,10 +26,10 @@ import org.apache.archiva.redback.rbac.Resource;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
-import org.codehaus.redback.integration.util.PermissionSorter;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.util.PermissionSorter;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java
index 946fad19..a2b25202 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java
@@ -29,12 +29,12 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.struts2.ServletActionContext;
 import org.apache.archiva.redback.rbac.Resource;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.reports.Report;
-import org.codehaus.redback.integration.reports.ReportException;
-import org.codehaus.redback.integration.reports.ReportManager;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.reports.Report;
+import org.apache.archiva.redback.integration.reports.ReportException;
+import org.apache.archiva.redback.integration.reports.ReportManager;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 
 import com.opensymphony.module.sitemesh.filter.PageResponseWrapper;
 import org.springframework.context.annotation.Scope;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java
index 7f6be5e4..f3620d11 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java
@@ -23,10 +23,10 @@ import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.Resource;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
-import org.codehaus.redback.integration.util.ResourceSorter;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.util.ResourceSorter;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java
index bdfb9ab7..032cad68 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java
@@ -27,10 +27,10 @@ import org.apache.archiva.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
 import org.codehaus.plexus.redback.struts2.action.AuditEvent;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.model.SimplePermission;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.model.SimplePermission;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java
index 9db8eb26..888f8760 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java
@@ -23,9 +23,9 @@ import org.apache.archiva.redback.rbac.Resource;
 import org.apache.archiva.redback.role.RoleManager;
 import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java
index 52451221..9dfb54dd 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java
@@ -23,9 +23,9 @@ import org.apache.archiva.redback.rbac.Resource;
 import org.apache.archiva.redback.rbac.Role;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java
index a93208cc..62b9fac7 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java
@@ -27,9 +27,9 @@ import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.plexus.registry.Registry;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java
index 7e5a3f66..ad477ff9 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java
@@ -27,10 +27,10 @@ import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
 import org.codehaus.plexus.redback.struts2.action.AuditEvent;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.model.CreateUserCredentials;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.model.CreateUserCredentials;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java
index 8987c969..460ce667 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java
@@ -31,9 +31,9 @@ import org.codehaus.plexus.redback.struts2.action.AuditEvent;
 import org.codehaus.plexus.redback.struts2.action.CancellableAction;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java
index 107e448e..a8f7ff85 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java
@@ -35,10 +35,10 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
 import org.apache.archiva.redback.users.UserManager;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.model.AdminEditUserCredentials;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java
index 873c0701..ad9f3b4c 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java
@@ -33,11 +33,11 @@ import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserQuery;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.reports.Report;
-import org.codehaus.redback.integration.reports.ReportManager;
-import org.codehaus.redback.integration.role.RoleConstants;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.reports.Report;
+import org.apache.archiva.redback.integration.reports.ReportManager;
+import org.apache.archiva.redback.integration.role.RoleConstants;
 import org.extremecomponents.table.context.Context;
 import org.extremecomponents.table.context.HttpServletRequestContext;
 import org.extremecomponents.table.limit.FilterSet;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java
index 6b4148ac..5a12d50e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.checks.xwork.XworkActionConfig;
-import org.codehaus.redback.integration.checks.xwork.XworkPackageConfig;
+import org.apache.archiva.redback.integration.checks.xwork.XworkActionConfig;
+import org.apache.archiva.redback.integration.checks.xwork.XworkPackageConfig;
 
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java
index ccb94e7f..b3108dd3 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.archiva.redback.system.check.EnvironmentCheck;
-import org.codehaus.redback.integration.checks.xwork.XworkPackageConfig;
+import org.apache.archiva.redback.integration.checks.xwork.XworkPackageConfig;
 
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ConfigurationManager;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
index 400faab8..76fe0e10 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.util.AutoLoginCookies;
+import org.apache.archiva.redback.integration.util.AutoLoginCookies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Scope;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java
index b26b7f37..9c8e9b8d 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java
@@ -21,6 +21,7 @@ package org.codehaus.plexus.redback.struts2.interceptor;
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.archiva.redback.integration.checks.security.AdminAutoCreateCheck;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.commons.lang.StringUtils;
@@ -33,8 +34,7 @@ import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
 import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.redback.integration.checks.security.AdminAutoCreateCheck;
-import org.codehaus.redback.integration.util.AutoLoginCookies;
+import org.apache.archiva.redback.integration.util.AutoLoginCookies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Scope;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java
index c72b88f3..07f23950 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java
@@ -30,9 +30,9 @@ import org.apache.archiva.redback.authorization.AuthorizationResult;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
-import org.codehaus.redback.integration.interceptor.SecureAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.interceptor.SecureAction;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
index 2c6a6ae0..40a8373b 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
@@ -31,8 +31,8 @@ import org.apache.archiva.redback.policy.AccountLockedException;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails;
 import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java
index 2c216446..9a739a2a 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java
@@ -34,7 +34,7 @@ import org.apache.archiva.redback.system.DefaultSecuritySession;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
 import org.apache.archiva.redback.users.memory.SimpleUser;
-import org.codehaus.redback.integration.model.AdminEditUserCredentials;
+import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;