diff --git a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
similarity index 97%
rename from src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
index 6a397e3..44013ea 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
similarity index 99%
rename from src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index ce7bd39..bb35c99 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
similarity index 97%
rename from src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
index 6065084..602142a 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
similarity index 97%
rename from src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
index 6df46d3..d2f8553 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,6 @@
 import org.quartz.SchedulerFactory;
 import org.quartz.Trigger;
 import org.quartz.TriggerListener;
-import org.quartz.core.QuartzScheduler;
 import org.quartz.impl.JobDetailImpl;
 import org.quartz.impl.StdScheduler;
 import org.quartz.impl.StdSchedulerFactory;
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
similarity index 96%
rename from src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
index d1db495..58dd6e8 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
similarity index 96%
rename from src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
index fceb852..aaed87b 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler.configuration;
+package org.apache.archiva.redback.components.scheduler.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import org.codehaus.redback.components.scheduler.Scheduler;
+import org.apache.archiva.redback.components.scheduler.Scheduler;
 import org.quartz.impl.StdSchedulerFactory;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/resources/META-INF/spring-context.xml b/src/main/resources/META-INF/spring-context.xml
index 04ec35b..cff1130 100755
--- a/src/main/resources/META-INF/spring-context.xml
+++ b/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,6 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.redback.components.scheduler"/>
+    base-package="org.apache.archiva.redback.components.scheduler"/>
  
 </beans>
\ No newline at end of file
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java b/src/test/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidatorTest.java
similarity index 96%
rename from src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
rename to src/test/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidatorTest.java
index 22e4146..79b1738 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidatorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
similarity index 95%
rename from src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
rename to src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
index 797c4a4..56caf57 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
similarity index 98%
rename from src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
rename to src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
index 56bd059..f473f1b 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/resources/spring-context.xml b/src/test/resources/spring-context.xml
index 16ec4a1..26f0515 100755
--- a/src/test/resources/spring-context.xml
+++ b/src/test/resources/spring-context.xml
@@ -20,13 +20,10 @@
   -->
 <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="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
+  <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
     <property name="properties">
       <props>
         <prop key="org.quartz.scheduler.instanceName">scheduler1</prop>