diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySpringLoader.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySpringLoader.java
deleted file mode 100644
index 0cb6c64272..0000000000
--- a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySpringLoader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.discovery.configuration;
-
-import org.dspace.kernel.config.SpringLoader;
-import org.dspace.services.ConfigurationService;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-/**
- * User: kevin (kevin at atmire.com)
- * Date: 3-aug-2011
- * Time: 11:39:37
- */
-public class DiscoverySpringLoader implements SpringLoader {
-
-    @Override
-    public String[] getResourcePaths(ConfigurationService configurationService) {
-        StringBuffer filePath = new StringBuffer();
-        filePath.append(configurationService.getProperty("dspace.dir"));
-        filePath.append(File.separator);
-        filePath.append("config");
-        filePath.append(File.separator);
-        filePath.append("spring");
-        filePath.append(File.separator);
-        filePath.append("discovery");
-        filePath.append(File.separator);
-
-        try {
-            return new String[]{new File(filePath.toString()).toURI().toURL().toString() + XML_SUFFIX};
-        } catch (MalformedURLException e) {
-            return new String[0];
-        }
-    }
-}
diff --git a/dspace/config/spring/discovery/spring-dspace-addon-discovery-solr-plugin-services.xml b/dspace/config/spring/api/discovery-solr.xml
similarity index 65%
rename from dspace/config/spring/discovery/spring-dspace-addon-discovery-solr-plugin-services.xml
rename to dspace/config/spring/api/discovery-solr.xml
index a3c87f06a3..aa72005f00 100644
--- a/dspace/config/spring/discovery/spring-dspace-addon-discovery-solr-plugin-services.xml
+++ b/dspace/config/spring/api/discovery-solr.xml
@@ -18,13 +18,6 @@
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
 
-    <bean class="org.dspace.discovery.SolrServiceResourceRestrictionPlugin" id="solrServiceResourceIndexPlugin" scope="prototype"/>
 
-    <alias name="solrServiceResourceIndexPlugin" alias="org.dspace.discovery.SolrServiceResourceRestrictionPlugin"/>
-
-    <!-- Additional indexing plugin to implement the browse system via SOLR -->
-    <bean id="solrBrowseIndexer" scope="prototype" 
-    	class="org.dspace.browse.SolrBrowseCreateDAO">
-    </bean>
 
 </beans>
diff --git a/dspace/config/spring/discovery/spring-dspace-addon-discovery-configuration-services.xml b/dspace/config/spring/api/discovery.xml
similarity index 95%
rename from dspace/config/spring/discovery/spring-dspace-addon-discovery-configuration-services.xml
rename to dspace/config/spring/api/discovery.xml
index 2035d9238d..0ae4be506d 100644
--- a/dspace/config/spring/discovery/spring-dspace-addon-discovery-configuration-services.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -19,6 +19,15 @@
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
 
+    <bean id="solrServiceResourceIndexPlugin" class="org.dspace.discovery.SolrServiceResourceRestrictionPlugin" scope="prototype"/>
+
+    <alias name="solrServiceResourceIndexPlugin" alias="org.dspace.discovery.SolrServiceResourceRestrictionPlugin"/>
+
+    <!-- Additional indexing plugin to implement the browse system via SOLR -->
+    <bean id="solrBrowseIndexer" scope="prototype"
+          class="org.dspace.browse.SolrBrowseCreateDAO">
+    </bean>
+
     <!--Bean that is used for mapping communities/collections to certain discovery configurations.-->
     <bean id="org.dspace.discovery.configuration.DiscoveryConfigurationService" class="org.dspace.discovery.configuration.DiscoveryConfigurationService">
         <property name="map">