diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
similarity index 96%
rename from redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
rename to redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
index 3235841c..577a07bf 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.jdo;
+package org.apache.archiva.redback.keys.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,8 @@ import org.codehaus.plexus.jdo.PlexusStoreException;
 import org.apache.archiva.redback.keys.AbstractKeyManager;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.keys.KeyNotFoundException;
+import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
+import org.codehaus.plexus.redback.keys.jdo.RedbackKeyManagementJdoModelloMetadata;
 import org.codehaus.plexus.util.StringUtils;
 import org.jpox.PersistenceManagerFactoryImpl;
 import org.springframework.stereotype.Service;
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/resources/META-INF/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/resources/META-INF/spring-context.xml
index b5b164cf..b757d07b 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/resources/META-INF/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/resources/META-INF/spring-context.xml
@@ -28,5 +28,5 @@
        default-lazy-init="true">
 
   <context:annotation-config />
-  <context:component-scan base-package="org.codehaus.plexus.redback.keys.jdo"/>
+  <context:component-scan base-package="org.apache.archiva.redback.keys.jdo"/>
 </beans>
\ No newline at end of file
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
similarity index 98%
rename from redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
rename to redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
index ec6a16de..8ec912e9 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.jdo;
+package org.apache.archiva.redback.keys.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
index ba46dc01..9c6d7f55 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
@@ -20,11 +20,8 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
   <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>