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 f9cf6506..f1f9a879 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
@@ -24,8 +24,8 @@ import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
-import org.codehaus.plexus.redback.keys.memory.MemoryAuthenticationKey;
-import org.codehaus.plexus.redback.keys.memory.MemoryKeyManager;
+import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
+import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.system.SecuritySession;
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
similarity index 98%
rename from redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
rename to redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
index ead07ca5..fb0b6d0e 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.memory;
+package org.apache.archiva.redback.keys.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
similarity index 96%
rename from redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
rename to redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
index 4823f813..6db38644 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.memory;
+package org.apache.archiva.redback.keys.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,7 @@ import org.apache.archiva.redback.keys.AbstractKeyManager;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Service;
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml
index a6cf8ab6..c314c5d8 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,6 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.keys.memory"/>
+    base-package="org.apache.archiva.redback.keys.memory"/>
  
 </beans>
\ No newline at end of file
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
similarity index 96%
rename from redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
rename to redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
index e1a502e0..256cfd24 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.memory;
+package org.apache.archiva.redback.keys.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one