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>