diff --git a/lite/src/main/resources/lite-config.xml b/lite/src/main/resources/lite-config.xml
index 4912f56..b26c65d 100644
--- a/lite/src/main/resources/lite-config.xml
+++ b/lite/src/main/resources/lite-config.xml
@@ -15,6 +15,7 @@
 	<context:component-scan
 		base-package="de.ids_mannheim.korap.rewrite,
 		de.ids_mannheim.korap.core.service, 
+	    de.ids_mannheim.korap.core.web,
 	    de.ids_mannheim.korap.web.filter, 
 		de.ids_mannheim.korap.web.utils,
 		de.ids_mannheim.korap.authentication.http" />
@@ -141,8 +142,6 @@
 	<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
 		<constructor-arg value="${krill.indexDir}" />
 	</bean>
-	<bean id="search_network" class="de.ids_mannheim.korap.web.SearchNetworkEndpoint"/>
-	
 
 	<!-- Filters -->
 	<!-- <bean id="APIVersionFilter" class="de.ids_mannheim.korap.web.APIVersionFilter"
@@ -158,12 +157,13 @@
 	</bean>
 
 	<!-- Controllers -->
+	<!-- added via component-scan
 	<bean id="annotationController"
 		class="de.ids_mannheim.korap.web.controller.AnnotationController" />
 	<bean id="searchController" class="de.ids_mannheim.korap.web.controller.SearchController" />
 	<bean id="statisticController"
 		class="de.ids_mannheim.korap.web.controller.StatisticController" />
-
+ -->
 	<!-- Services -->
 	<bean id="scopeService"
 		class="de.ids_mannheim.korap.oauth2.service.DummyOAuth2ScopeServiceImpl" />
diff --git a/lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java b/lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
index 882efce..3b01917 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
+++ b/lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
@@ -27,6 +27,7 @@
     
     public static String[] classPackages =
             new String[] { "de.ids_mannheim.korap.web",
+                    "de.ids_mannheim.korap.core.web",
                     "de.ids_mannheim.korap.test",
                     "com.fasterxml.jackson.jaxrs.json"};
     
diff --git a/lite/src/test/resources/test-config.xml b/lite/src/test/resources/test-config.xml
index 4f09e03..b2f6b73 100644
--- a/lite/src/test/resources/test-config.xml
+++ b/lite/src/test/resources/test-config.xml
@@ -15,6 +15,7 @@
 	<context:component-scan
 		base-package="de.ids_mannheim.korap.rewrite,
 		de.ids_mannheim.korap.core.service,
+		de.ids_mannheim.korap.core.web,
 		de.ids_mannheim.korap.web.filter, 
 		de.ids_mannheim.korap.web.utils,
 		de.ids_mannheim.korap.authentication.http" />
@@ -132,8 +133,6 @@
 	<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
 		<constructor-arg value="${krill.indexDir}" />
 	</bean>
-	<bean id="search_network" class="de.ids_mannheim.korap.web.SearchNetworkEndpoint"/>
-	
 
 	<!-- Filters -->
 	<!-- <bean id="APIVersionFilter" class="de.ids_mannheim.korap.web.APIVersionFilter" 
@@ -148,13 +147,13 @@
 	</bean>
 
 	<!-- Controllers -->
+	<!-- added via component-scan
 	<bean id="annotationController"
 		class="de.ids_mannheim.korap.web.controller.AnnotationController" />
 	<bean id="searchController" class="de.ids_mannheim.korap.web.controller.SearchController" />
 	<bean id="statisticController"
 		class="de.ids_mannheim.korap.web.controller.StatisticController" />
-	<!-- <bean id="testController"
-		class="de.ids_mannheim.korap.test.TestController" /> -->
+	-->
 
 	<!-- Services -->
 	<bean id="scopeService"