diff --git a/redback-authentication/redback-authentication-providers/pom.xml b/redback-authentication/redback-authentication-providers/pom.xml
index 964d7cd3..f395ec14 100644
--- a/redback-authentication/redback-authentication-providers/pom.xml
+++ b/redback-authentication/redback-authentication-providers/pom.xml
@@ -31,5 +31,6 @@
     <module>redback-authentication-open</module>
     <module>redback-authentication-memory</module>    
     <module>redback-authentication-ldap</module>
+    <module>redback-authentication-users</module>
   </modules>
 </project>
diff --git a/redback-users/redback-authentication-users/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
similarity index 96%
rename from redback-users/redback-authentication-users/pom.xml
rename to redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
index be486404..b8a59643 100644
--- a/redback-users/redback-authentication-users/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
@@ -25,7 +25,6 @@
     <groupId>org.apache.archiva.redback</groupId>
     <artifactId>redback-authentication-providers</artifactId>
     <version>2.1-SNAPSHOT</version>
-    <relativePath>../../redback-authentication/redback-authentication-providers/pom.xml</relativePath>
   </parent>
 
   <artifactId>redback-authentication-users</artifactId>
diff --git a/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
similarity index 100%
rename from redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
rename to redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
diff --git a/redback-users/redback-authentication-users/src/main/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from redback-users/redback-authentication-users/src/main/resources/META-INF/spring-context.xml
rename to redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/resources/META-INF/spring-context.xml
diff --git a/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java
similarity index 100%
rename from redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java
rename to redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java
diff --git a/redback-users/redback-authentication-users/src/test/resources/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
similarity index 100%
rename from redback-users/redback-authentication-users/src/test/resources/spring-context.xml
rename to redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
diff --git a/redback-users/pom.xml b/redback-users/pom.xml
index c4b11273..894d555d 100644
--- a/redback-users/pom.xml
+++ b/redback-users/pom.xml
@@ -31,6 +31,5 @@
     <module>redback-users-api</module>
     <module>redback-users-providers</module>
     <module>redback-users-tests</module>
-    <module>redback-authentication-users</module>
   </modules>
 </project>