diff --git a/core/Changes b/core/Changes
index fec34f4..d51b7bd 100644
--- a/core/Changes
+++ b/core/Changes
@@ -1,5 +1,10 @@
 # version 0.70.1
 
+- Renamed entity and service packages in core
+- Renamed web.controller package in core
+- Moved SearchNetworkEndpoint to core.service package
+
+
 # version 0.70
 
 - Added data folder containing super_client_info and database 
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java b/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
index 1f6abd7..4730a4f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
@@ -9,13 +9,13 @@
 import org.springframework.stereotype.Service;
 
 import de.ids_mannheim.korap.core.entity.AnnotationLayer;
+import de.ids_mannheim.korap.core.web.controller.AnnotationController;
 import de.ids_mannheim.korap.dao.AnnotationDao;
 import de.ids_mannheim.korap.dto.FoundryDto;
 import de.ids_mannheim.korap.dto.LayerDto;
 import de.ids_mannheim.korap.dto.converter.AnnotationConverter;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.exceptions.StatusCodes;
-import de.ids_mannheim.korap.web.controller.AnnotationController;
 
 /** AnnotationService defines the logic behind {@link AnnotationController}.
  * 
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/SearchNetworkEndpoint.java b/core/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
similarity index 98%
rename from core/src/main/java/de/ids_mannheim/korap/web/SearchNetworkEndpoint.java
rename to core/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
index 1f2063a..de6038e 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/SearchNetworkEndpoint.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web;
+package de.ids_mannheim.korap.core.service;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java b/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
index e6d2368..96b5f62 100644
--- a/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
@@ -40,7 +40,6 @@
 import de.ids_mannheim.korap.utils.JsonUtils;
 import de.ids_mannheim.korap.web.ClientsHandler;
 import de.ids_mannheim.korap.web.SearchKrill;
-import de.ids_mannheim.korap.web.SearchNetworkEndpoint;
 
 @Service
 public class SearchService extends BasicService{
@@ -418,7 +417,7 @@
         User user = createUser(username, headers);
         Pattern p = determineAvailabilityPattern(user);
 
-        boolean match_only = foundries == null || foundries.isEmpty();
+//        boolean match_only = foundries == null || foundries.isEmpty();
         String results;
 //        try {
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java b/core/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
similarity index 98%
rename from core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java
rename to core/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
index be4f62c..26d51dc 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.controller;
+package de.ids_mannheim.korap.core.web.controller;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java b/core/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
similarity index 99%
rename from core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
rename to core/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
index 7867f5f..acddf23 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.controller;// package
+package de.ids_mannheim.korap.core.web.controller;// package
                                              // de.ids_mannheim.korap.ext.web;
 
 import java.util.HashMap;
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java b/core/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
similarity index 98%
rename from core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
rename to core/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
index 2379997..c053d45 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.controller;
+package de.ids_mannheim.korap.core.web.controller;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
index 172a22c..e7fa88e 100644
--- a/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
+++ b/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
@@ -41,7 +41,8 @@
     protected static KustvaktArgs kargs;
 
     public KustvaktBaseServer () {
-        rootPackages = "de.ids_mannheim.korap.web; "
+        rootPackages = "de.ids_mannheim.korap.core.web; "
+                + "de.ids_mannheim.korap.web; "
                 + "com.fasterxml.jackson.jaxrs.json;";
         
         File d = new File(KustvaktConfiguration.DATA_FOLDER);
diff --git a/full/Changes b/full/Changes
index 917e30e..2a58fe7 100644
--- a/full/Changes
+++ b/full/Changes
@@ -1,5 +1,10 @@
 # version 0.70.1
 
+- Renamed entity and service packages in core
+- Renamed web.controller package in core
+- Moved SearchNetworkEndpoint to core.service package
+
+
 # version 0.70
 
 - Added data folder containing super_client_info and database 
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java b/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
index 64f55bb..d393764 100644
--- a/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
@@ -29,6 +29,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/Changes b/lite/Changes
index 86656b1..55b58ef 100644
--- a/lite/Changes
+++ b/lite/Changes
@@ -1,5 +1,9 @@
 # version 0.70.1
 
+- Renamed entity and service packages in core
+- Renamed web.controller package in core
+- Moved SearchNetworkEndpoint to core.service package
+
 # version 0.70
 
 - Added data folder containing super_client_info and database 
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"