diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
similarity index 98%
rename from redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java
rename to redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
index 14ee716f..054ad418 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,6 +30,8 @@ import org.codehaus.plexus.jdo.PlexusStoreException;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
 import org.apache.archiva.redback.users.PermanentUserException;
 import org.apache.archiva.redback.users.UserQuery;
+import org.codehaus.plexus.redback.users.jdo.JdoUser;
+import org.codehaus.plexus.redback.users.jdo.UsersManagementModelloMetadata;
 import org.codehaus.plexus.util.StringUtils;
 import org.jpox.JDOClassLoaderResolver;
 import org.springframework.stereotype.Service;
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java
similarity index 98%
rename from redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java
rename to redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java
index 1b291146..77933e92 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
similarity index 98%
rename from redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java
rename to redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
index 26fed4b1..ee99ae1c 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml
index cc2328df..522f90b4 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml
@@ -28,6 +28,6 @@
         default-lazy-init="true">
 
   <context:annotation-config />
-  <context:component-scan base-package="org.codehaus.plexus.redback.users.jdo"/>
+  <context:component-scan base-package="org.apache.archiva.redback.users.jdo"/>
 
 </beans>
\ No newline at end of file
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/codehaus/plexus/redback/users/jdo/messages.properties b/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties
similarity index 100%
rename from redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/codehaus/plexus/redback/users/jdo/messages.properties
rename to redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java b/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
similarity index 97%
rename from redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java
rename to redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
index 7bee0c8a..970a279b 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.users.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.users.jdo.JdoUserManager;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.redback.common.jdo.test.StoreManagerDebug;
 import org.codehaus.plexus.redback.users.provider.test.AbstractUserManagerTestCase;
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/apache/archiva/redback/config-defaults.properties
similarity index 100%
rename from redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
rename to redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/apache/archiva/redback/config-defaults.properties