diff --git a/core/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java b/core/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
index fef7ea6..ccb6d1a 100644
--- a/core/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
+++ b/core/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
@@ -18,10 +18,10 @@
 import org.springframework.stereotype.Component;
 
 import de.ids_mannheim.korap.constant.AnnotationType;
+import de.ids_mannheim.korap.core.entity.Annotation;
+import de.ids_mannheim.korap.core.entity.AnnotationKey;
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
 import de.ids_mannheim.korap.dao.AnnotationDao;
-import de.ids_mannheim.korap.entity.Annotation;
-import de.ids_mannheim.korap.entity.AnnotationKey;
-import de.ids_mannheim.korap.entity.AnnotationLayer;
 
 /** Parser for extracting annotation descriptions from Kalamar javascripts 
  * 
diff --git a/core/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java b/core/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
index fa003d4..8740919 100644
--- a/core/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
+++ b/core/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
@@ -10,7 +10,7 @@
 import java.util.List;
 
 import de.ids_mannheim.korap.constant.AnnotationType;
-import de.ids_mannheim.korap.entity.Annotation;
+import de.ids_mannheim.korap.core.entity.Annotation;
 
 /**
  * Helper class to parse annotation scripts variables. It prints out
diff --git a/core/src/main/java/de/ids_mannheim/korap/entity/Annotation.java b/core/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
similarity index 96%
rename from core/src/main/java/de/ids_mannheim/korap/entity/Annotation.java
rename to core/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
index 35ee11d..fe723fc 100644
--- a/core/src/main/java/de/ids_mannheim/korap/entity/Annotation.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.entity;
+package de.ids_mannheim.korap.core.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/core/src/main/java/de/ids_mannheim/korap/entity/AnnotationKey.java b/core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
similarity index 97%
rename from core/src/main/java/de/ids_mannheim/korap/entity/AnnotationKey.java
rename to core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
index a4ccdaa..f94c715 100644
--- a/core/src/main/java/de/ids_mannheim/korap/entity/AnnotationKey.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.entity;
+package de.ids_mannheim.korap.core.entity;
 
 import java.util.Set;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/entity/AnnotationLayer.java b/core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
similarity index 97%
rename from core/src/main/java/de/ids_mannheim/korap/entity/AnnotationLayer.java
rename to core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
index 00f6d6e..3160cef 100644
--- a/core/src/main/java/de/ids_mannheim/korap/entity/AnnotationLayer.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.entity;
+package de.ids_mannheim.korap.core.entity;
 
 import java.util.Set;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/entity/Resource.java b/core/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
similarity index 97%
rename from core/src/main/java/de/ids_mannheim/korap/entity/Resource.java
rename to core/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
index 246d80d..1f26d7f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/entity/Resource.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.entity;
+package de.ids_mannheim.korap.core.entity;
 
 import java.util.Set;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/service/AnnotationService.java b/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
similarity index 96%
rename from core/src/main/java/de/ids_mannheim/korap/service/AnnotationService.java
rename to core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
index 50aa378..1f6abd7 100644
--- a/core/src/main/java/de/ids_mannheim/korap/service/AnnotationService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.service;
+package de.ids_mannheim.korap.core.service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,11 +8,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
 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.entity.AnnotationLayer;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.exceptions.StatusCodes;
 import de.ids_mannheim.korap.web.controller.AnnotationController;
diff --git a/core/src/main/java/de/ids_mannheim/korap/service/BasicService.java b/core/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
similarity index 90%
rename from core/src/main/java/de/ids_mannheim/korap/service/BasicService.java
rename to core/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
index 040bdca..c1072dd 100644
--- a/core/src/main/java/de/ids_mannheim/korap/service/BasicService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.service;
+package de.ids_mannheim.korap.core.service;
 
 import java.util.List;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/service/SearchService.java b/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
similarity index 99%
rename from core/src/main/java/de/ids_mannheim/korap/service/SearchService.java
rename to core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
index 526d1e5..e6d2368 100644
--- a/core/src/main/java/de/ids_mannheim/korap/service/SearchService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.service;
+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/service/StatisticService.java b/core/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
similarity index 98%
rename from core/src/main/java/de/ids_mannheim/korap/service/StatisticService.java
rename to core/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
index df73d10..54f5e1a 100644
--- a/core/src/main/java/de/ids_mannheim/korap/service/StatisticService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.service;
+package de.ids_mannheim.korap.core.service;
 
 import java.util.List;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java b/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
index b7b576c..43b7fd0 100644
--- a/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
+++ b/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
@@ -15,12 +15,12 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import de.ids_mannheim.korap.constant.AnnotationType;
-import de.ids_mannheim.korap.entity.Annotation;
-import de.ids_mannheim.korap.entity.AnnotationKey;
-import de.ids_mannheim.korap.entity.AnnotationKey_;
-import de.ids_mannheim.korap.entity.AnnotationLayer;
-import de.ids_mannheim.korap.entity.AnnotationLayer_;
-import de.ids_mannheim.korap.entity.Annotation_;
+import de.ids_mannheim.korap.core.entity.Annotation;
+import de.ids_mannheim.korap.core.entity.AnnotationKey;
+import de.ids_mannheim.korap.core.entity.AnnotationKey_;
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
+import de.ids_mannheim.korap.core.entity.AnnotationLayer_;
+import de.ids_mannheim.korap.core.entity.Annotation_;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.utils.ParameterChecker;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java b/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
index da3298c..c26a39d 100644
--- a/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
+++ b/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
@@ -15,9 +15,9 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import de.ids_mannheim.korap.entity.AnnotationLayer;
-import de.ids_mannheim.korap.entity.Resource;
-import de.ids_mannheim.korap.entity.Resource_;
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
+import de.ids_mannheim.korap.core.entity.Resource;
+import de.ids_mannheim.korap.core.entity.Resource_;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.utils.ParameterChecker;
 
diff --git a/core/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java b/core/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
index efe1c43..b192cfd 100644
--- a/core/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
+++ b/core/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
@@ -10,13 +10,13 @@
 
 import org.springframework.stereotype.Component;
 
+import de.ids_mannheim.korap.core.entity.Annotation;
+import de.ids_mannheim.korap.core.entity.AnnotationKey;
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
 import de.ids_mannheim.korap.dto.FoundryDto;
 import de.ids_mannheim.korap.dto.FoundryDto.Key;
 import de.ids_mannheim.korap.dto.FoundryDto.Layer;
 import de.ids_mannheim.korap.dto.LayerDto;
-import de.ids_mannheim.korap.entity.Annotation;
-import de.ids_mannheim.korap.entity.AnnotationKey;
-import de.ids_mannheim.korap.entity.AnnotationLayer;
 
 /**
  * AnnotationConverter prepares data transfer objects (DTOs) from
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java b/core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java
index 900272c..be4f62c 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/controller/AnnotationController.java
@@ -15,12 +15,11 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
-
+import de.ids_mannheim.korap.core.service.AnnotationService;
 import de.ids_mannheim.korap.dto.FoundryDto;
 import de.ids_mannheim.korap.dto.LayerDto;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.exceptions.StatusCodes;
-import de.ids_mannheim.korap.service.AnnotationService;
 import de.ids_mannheim.korap.utils.JsonUtils;
 import de.ids_mannheim.korap.web.KustvaktResponseHandler;
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java b/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
index 4dd51c7..7867f5f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
@@ -32,10 +32,10 @@
 import de.ids_mannheim.korap.web.utils.SearchResourceFilters;
 import de.ids_mannheim.korap.config.KustvaktConfiguration;
 import de.ids_mannheim.korap.constant.OAuth2Scope;
+import de.ids_mannheim.korap.core.service.SearchService;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.oauth2.service.OAuth2ScopeService;
 import de.ids_mannheim.korap.security.context.TokenContext;
-import de.ids_mannheim.korap.service.SearchService;
 import de.ids_mannheim.korap.utils.JsonUtils;
 import de.ids_mannheim.korap.utils.ServiceInfo;
 import de.ids_mannheim.korap.web.KustvaktResponseHandler;
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java b/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
index 7ba31e4..2379997 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
@@ -20,9 +20,8 @@
 import org.springframework.stereotype.Controller;
 
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
-
+import de.ids_mannheim.korap.core.service.StatisticService;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
-import de.ids_mannheim.korap.service.StatisticService;
 import de.ids_mannheim.korap.web.CoreResponseHandler;
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
 import de.ids_mannheim.korap.web.filter.PiwikFilter;
diff --git a/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java b/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
index 3cbb2ab..f6a0ee5 100644
--- a/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
+++ b/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
@@ -15,10 +15,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
+import de.ids_mannheim.korap.core.entity.Resource;
 import de.ids_mannheim.korap.dao.AnnotationDao;
 import de.ids_mannheim.korap.dao.ResourceDao;
-import de.ids_mannheim.korap.entity.AnnotationLayer;
-import de.ids_mannheim.korap.entity.Resource;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 
 /** Parser for extracting data from free-resources.json containing
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
index da5c2d3..b4ff8eb 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
@@ -7,9 +7,9 @@
 
 import org.springframework.stereotype.Component;
 
+import de.ids_mannheim.korap.core.entity.AnnotationLayer;
+import de.ids_mannheim.korap.core.entity.Resource;
 import de.ids_mannheim.korap.dto.ResourceDto;
-import de.ids_mannheim.korap.entity.AnnotationLayer;
-import de.ids_mannheim.korap.entity.Resource;
 
 /**
  * ResourceConverter prepares data transfer objects (DTOs) from
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/ResourceService.java b/full/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
index 373f42f..f22ae68 100644
--- a/full/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
+++ b/full/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
@@ -7,10 +7,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import de.ids_mannheim.korap.core.entity.Resource;
 import de.ids_mannheim.korap.dao.ResourceDao;
 import de.ids_mannheim.korap.dto.ResourceDto;
 import de.ids_mannheim.korap.dto.converter.ResourceConverter;
-import de.ids_mannheim.korap.entity.Resource;
 import de.ids_mannheim.korap.web.controller.ResourceController;
 
 /** ResourceService defines the logic behind {@link ResourceController}.
diff --git a/full/src/main/resources/default-config.xml b/full/src/main/resources/default-config.xml
index 9d3ad26..f1fa31f 100644
--- a/full/src/main/resources/default-config.xml
+++ b/full/src/main/resources/default-config.xml
@@ -137,6 +137,7 @@
 
 		<property name="packagesToScan">
 			<array>
+				<value>de.ids_mannheim.korap.core.entity</value>
 				<value>de.ids_mannheim.korap.entity</value>
 				<value>de.ids_mannheim.korap.oauth2.entity</value>
 			</array>
diff --git a/full/src/test/resources/test-config-icc.xml b/full/src/test/resources/test-config-icc.xml
index 3daf85b..1ff9ed0 100644
--- a/full/src/test/resources/test-config-icc.xml
+++ b/full/src/test/resources/test-config-icc.xml
@@ -126,6 +126,7 @@
 		<property name="dataSource" ref="sqliteDataSource" />
 		<property name="packagesToScan">
 			<array>
+				<value>de.ids_mannheim.korap.core.entity</value>
 				<value>de.ids_mannheim.korap.entity</value>
 				<value>de.ids_mannheim.korap.oauth2.entity</value>
 			</array>
diff --git a/full/src/test/resources/test-config.xml b/full/src/test/resources/test-config.xml
index 166c498..84ba875 100644
--- a/full/src/test/resources/test-config.xml
+++ b/full/src/test/resources/test-config.xml
@@ -126,6 +126,7 @@
 		<property name="dataSource" ref="sqliteDataSource" />
 		<property name="packagesToScan">
 			<array>
+				<value>de.ids_mannheim.korap.core.entity</value>
 				<value>de.ids_mannheim.korap.entity</value>
 				<value>de.ids_mannheim.korap.oauth2.entity</value>
 			</array>
diff --git a/lite/src/main/resources/lite-config.xml b/lite/src/main/resources/lite-config.xml
index a914f95..4912f56 100644
--- a/lite/src/main/resources/lite-config.xml
+++ b/lite/src/main/resources/lite-config.xml
@@ -14,7 +14,7 @@
 
 	<context:component-scan
 		base-package="de.ids_mannheim.korap.rewrite,
-		de.ids_mannheim.korap.service, 
+		de.ids_mannheim.korap.core.service, 
 	    de.ids_mannheim.korap.web.filter, 
 		de.ids_mannheim.korap.web.utils,
 		de.ids_mannheim.korap.authentication.http" />
@@ -91,7 +91,7 @@
 
 		<property name="packagesToScan">
 			<array>
-				<value>de.ids_mannheim.korap.entity</value>
+				<value>de.ids_mannheim.korap.core.entity</value>
 			</array>
 		</property>
 		<property name="jpaVendorAdapter">
diff --git a/lite/src/test/resources/test-config.xml b/lite/src/test/resources/test-config.xml
index b3f508e..4f09e03 100644
--- a/lite/src/test/resources/test-config.xml
+++ b/lite/src/test/resources/test-config.xml
@@ -14,7 +14,7 @@
 
 	<context:component-scan
 		base-package="de.ids_mannheim.korap.rewrite,
-		de.ids_mannheim.korap.service,
+		de.ids_mannheim.korap.core.service,
 		de.ids_mannheim.korap.web.filter, 
 		de.ids_mannheim.korap.web.utils,
 		de.ids_mannheim.korap.authentication.http" />
@@ -89,7 +89,7 @@
 
 		<property name="packagesToScan">
 			<array>
-				<value>de.ids_mannheim.korap.entity</value>
+				<value>de.ids_mannheim.korap.core.entity</value>
 			</array>
 		</property>
 		<property name="jpaVendorAdapter">