diff --git a/redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/PrincipalLockedException.java b/redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/PrincipalLockedException.java
similarity index 96%
rename from redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/PrincipalLockedException.java
rename to redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/PrincipalLockedException.java
index 0fdbeb02..96a63ac8 100644
--- a/redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/PrincipalLockedException.java
+++ b/redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/PrincipalLockedException.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.jsecurity;
+package org.apache.archiva.redback.jsecurity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/PrincipalPasswordChangeRequiredException.java b/redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/PrincipalPasswordChangeRequiredException.java
similarity index 96%
rename from redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/PrincipalPasswordChangeRequiredException.java
rename to redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/PrincipalPasswordChangeRequiredException.java
index 1d2d2ff2..bd7df563 100644
--- a/redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/PrincipalPasswordChangeRequiredException.java
+++ b/redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/PrincipalPasswordChangeRequiredException.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.jsecurity;
+package org.apache.archiva.redback.jsecurity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/RedbackRealm.java b/redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/RedbackRealm.java
similarity index 99%
rename from redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/RedbackRealm.java
rename to redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/RedbackRealm.java
index ecf23eb3..3e9c2dcd 100644
--- a/redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/RedbackRealm.java
+++ b/redback-integrations/redback-jsecurity/src/main/java/org/apache/archiva/redback/jsecurity/RedbackRealm.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.jsecurity;
+package org.apache.archiva.redback.jsecurity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-integrations/redback-jsecurity/src/test/java/org/codehaus/redback/jsecurity/RedbackRealmTest.java b/redback-integrations/redback-jsecurity/src/test/java/org/apache/archiva/redback/jsecurity/RedbackRealmTest.java
similarity index 96%
rename from redback-integrations/redback-jsecurity/src/test/java/org/codehaus/redback/jsecurity/RedbackRealmTest.java
rename to redback-integrations/redback-jsecurity/src/test/java/org/apache/archiva/redback/jsecurity/RedbackRealmTest.java
index c080c638..e2b75bd6 100644
--- a/redback-integrations/redback-jsecurity/src/test/java/org/codehaus/redback/jsecurity/RedbackRealmTest.java
+++ b/redback-integrations/redback-jsecurity/src/test/java/org/apache/archiva/redback/jsecurity/RedbackRealmTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.jsecurity;
+package org.apache.archiva.redback.jsecurity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,9 @@ package org.codehaus.redback.jsecurity;
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.jsecurity.PrincipalLockedException;
+import org.apache.archiva.redback.jsecurity.PrincipalPasswordChangeRequiredException;
+import org.apache.archiva.redback.jsecurity.RedbackRealm;
 import org.apache.archiva.redback.policy.UserSecurityPolicy;
 import org.apache.archiva.redback.rbac.Operation;
 import org.apache.archiva.redback.rbac.Permission;