diff --git a/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java b/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java
similarity index 87%
rename from modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java
rename to modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java
index a608cd7..91a9aca 100644
--- a/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java
+++ b/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -53,7 +53,7 @@
         // Generate the reader
         String className = model.getName() + outputType;
 
-        writeClass( "org/codehaus/modello/plugin/registry/" + outputType + ".java.vm", getOutputDirectory(),
-                    packageName, className, context );
+        writeClass( getClass().getPackage().getName().replaceAll( "\\.", "/" ) + "/" + outputType + ".java.vm",
+                    getOutputDirectory(), packageName, className, context );
     }
 }
diff --git a/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java b/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java
similarity index 94%
rename from modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java
rename to modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java
index 12517f6..b354dfc 100644
--- a/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java
+++ b/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java b/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java
similarity index 94%
rename from modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java
rename to modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java
index 791a40c..91026e7 100644
--- a/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java
+++ b/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml b/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
index c995f7d..62080a8 100644
--- a/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
+++ b/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
@@ -25,7 +25,7 @@
     <component>
       <role>org.codehaus.modello.plugin.ModelloGenerator</role>
       <role-hint>registry-reader</role-hint>
-      <implementation>org.codehaus.modello.plugin.registry.RegistryReaderGenerator</implementation>
+      <implementation>org.apache.archiva.redback.components.registry.modello.RegistryReaderGenerator</implementation>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.velocity.VelocityComponent</role>
@@ -35,7 +35,7 @@
     <component>
       <role>org.codehaus.modello.plugin.ModelloGenerator</role>
       <role-hint>registry-writer</role-hint>
-      <implementation>org.codehaus.modello.plugin.registry.RegistryWriterGenerator</implementation>
+      <implementation>org.apache.archiva.redback.components.registry.modello.RegistryWriterGenerator</implementation>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.velocity.VelocityComponent</role>
diff --git a/modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryReader.java.vm b/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryReader.java.vm
similarity index 100%
rename from modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryReader.java.vm
rename to modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryReader.java.vm
diff --git a/modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryWriter.java.vm b/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm
similarity index 100%
rename from modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryWriter.java.vm
rename to modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm
diff --git a/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
similarity index 98%
rename from modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
rename to modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
index 22e5934..3a57c08 100644
--- a/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
+++ b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java
similarity index 94%
rename from modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java
rename to modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java
index bf5068d..5393c91 100644
--- a/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java
+++ b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java
similarity index 94%
rename from modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java
rename to modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java
index 456efaf..a0cc5a3 100644
--- a/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java
+++ b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one