diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
index 13ffc0015..633a11516 100755
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
@@ -38,9 +38,11 @@
   <bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
     <constructor-arg ref="jcr-config"/>
   </bean>
-  <bean id="jcr-config" class="org.apache.archiva.web.startup.ArchivaJcrRepositoryConfig" factory-method="create">
+
+  <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create">
     <constructor-arg value="${appserver.base}/conf/repository.xml"/>
     <constructor-arg value="${appserver.base}/jcr"/>
   </bean>
 
+
 </beans>
\ No newline at end of file
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index b4138bf71..347af4203 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <scope>test</scope>
+      <scope>provided</scope>
       <!-- could trim more, but since it's just for test we don't need to worry -->
       <exclusions>
         <exclusion>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
similarity index 92%
rename from archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
rename to archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
index 54bc98ba1..e6e5740c4 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.startup;
+package org.apache.archiva.metadata.repository.jcr;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -43,7 +43,7 @@ public class ArchivaJcrRepositoryConfig
         File configurationFile = new File( file );
         if ( !configurationFile.exists( ) )
         {
-            String resourcePath = "org/apache/archiva/repository.xml";
+            String resourcePath = "org/apache/archiva/metadata/repository/jcr/repository.xml";
             LoggerFactory.getLogger( ArchivaJcrRepositoryConfig.class ).info(
                 "no repository.xml file in path {} so use default from resources path {}", file, resourcePath );
             // use bundled repository.xml
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
index 878017083..fd2e154b5 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
@@ -30,4 +30,6 @@
   <context:annotation-config/>
   <context:component-scan base-package="org.apache.archiva.metadata.repository.jcr"/>
 
+
+
 </beans>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
similarity index 100%
rename from archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
rename to archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml