diff --git a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java b/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
similarity index 97%
rename from redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java
rename to redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
index d371d630..3df18005 100644
--- a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java
+++ b/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.management;
+package org.apache.archiva.redback.management;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
similarity index 99%
rename from redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java
rename to redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
index 28682c8c..c0cb6893 100644
--- a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java
+++ b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.management;
+package org.apache.archiva.redback.management;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,6 +34,7 @@ import java.util.Map;
 
 import javax.xml.stream.XMLStreamException;
 
+import org.apache.archiva.redback.management.DataManagementTool;
 import org.apache.archiva.redback.users.UserManager;
 import org.codehaus.plexus.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.redback.keys.KeyManager;
diff --git a/redback-data-management/src/main/resources/META-INF/spring-context.xml b/redback-data-management/src/main/resources/META-INF/spring-context.xml
index 0c1d12ad..73522781 100644
--- a/redback-data-management/src/main/resources/META-INF/spring-context.xml
+++ b/redback-data-management/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,6 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.management"/>
+    base-package="org.apache.archiva.redback.management"/>
  
 </beans>
\ No newline at end of file
diff --git a/redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
similarity index 99%
rename from redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java
rename to redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
index e52aff9b..65408920 100644
--- a/redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java
+++ b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.management;
+package org.apache.archiva.redback.management;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.codehaus.plexus.redback.management;
 
 import junit.framework.TestCase;
 import org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory;
+import org.apache.archiva.redback.management.DataManagementTool;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.commons.lang.SystemUtils;
 import org.codehaus.plexus.redback.keys.AuthenticationKey;
diff --git a/redback-data-management/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
similarity index 100%
rename from redback-data-management/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
rename to redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
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 74b5331b..04fbaa7f 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
@@ -22,7 +22,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
 import com.opensymphony.xwork2.Preparable;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.management.DataManagementTool;
+import org.apache.archiva.redback.management.DataManagementTool;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;