diff --git a/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java b/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
index 3f71e9f..3ac71b9 100644
--- a/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
+++ b/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
diff --git a/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java b/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
index 09d652c..0d6bc4c 100644
--- a/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
+++ b/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.core.entity.Annotation;
+import de.ids_mannheim.korap.entity.Annotation;
 
 /**
  * Helper class to parse annotation scripts variables. It prints out
diff --git a/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java b/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
index 6a6ca88..e8047d3 100644
--- a/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
+++ b/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;
 
 /**
diff --git a/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java b/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
index e7680e2..9f64294 100644
--- a/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
+++ b/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
@@ -8,12 +8,12 @@
 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.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.entity.AnnotationLayer;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.exceptions.StatusCodes;
 
diff --git a/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java b/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
index 4aa7cd4..577df4e 100644
--- a/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
+++ b/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
@@ -6,12 +6,12 @@
 import org.springframework.transaction.annotation.Transactional;
 
 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.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.entity.AnnotationKey_;
+import de.ids_mannheim.korap.entity.AnnotationLayer_;
+import de.ids_mannheim.korap.entity.Annotation_;
+import de.ids_mannheim.korap.entity.Annotation;
+import de.ids_mannheim.korap.entity.AnnotationKey;
+import de.ids_mannheim.korap.entity.AnnotationLayer;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.utils.ParameterChecker;
 import jakarta.persistence.EntityManager;
diff --git a/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java b/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
index c121669..62d3b79 100644
--- a/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
+++ b/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.core.entity.AnnotationLayer;
-import de.ids_mannheim.korap.core.entity.Resource;
-import de.ids_mannheim.korap.core.entity.Resource_;
+import de.ids_mannheim.korap.entity.Resource_;
+import de.ids_mannheim.korap.entity.AnnotationLayer;
+import de.ids_mannheim.korap.entity.Resource;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.utils.ParameterChecker;
 
diff --git a/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
index a1cc536..d191331 100644
--- a/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
+++ b/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
@@ -10,12 +10,12 @@
 
 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.entity.Annotation;
+import de.ids_mannheim.korap.entity.AnnotationKey;
+import de.ids_mannheim.korap.entity.AnnotationLayer;
 import de.ids_mannheim.korap.dto.LayerDto;
 
 /**
diff --git a/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
index d04576c..0ee0bef 100644
--- a/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
+++ b/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/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java b/src/main/java/de/ids_mannheim/korap/entity/Annotation.java
similarity index 96%
rename from src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
rename to src/main/java/de/ids_mannheim/korap/entity/Annotation.java
index f29cac9..456b31c 100644
--- a/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/Annotation.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.core.entity;
+package de.ids_mannheim.korap.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java b/src/main/java/de/ids_mannheim/korap/entity/AnnotationKey.java
similarity index 97%
rename from src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
rename to src/main/java/de/ids_mannheim/korap/entity/AnnotationKey.java
index fb3012d..e6b06d8 100644
--- a/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/AnnotationKey.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.core.entity;
+package de.ids_mannheim.korap.entity;
 
 import java.util.Set;
 
diff --git a/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java b/src/main/java/de/ids_mannheim/korap/entity/AnnotationLayer.java
similarity index 97%
rename from src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
rename to src/main/java/de/ids_mannheim/korap/entity/AnnotationLayer.java
index 9beb694..ccf4536 100644
--- a/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/AnnotationLayer.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.core.entity;
+package de.ids_mannheim.korap.entity;
 
 import java.util.Set;
 
diff --git a/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java b/src/main/java/de/ids_mannheim/korap/entity/Resource.java
similarity index 97%
rename from src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
rename to src/main/java/de/ids_mannheim/korap/entity/Resource.java
index e002451..cd5ba9a 100644
--- a/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/Resource.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.core.entity;
+package de.ids_mannheim.korap.entity;
 
 import java.util.Set;
 
diff --git a/src/main/java/de/ids_mannheim/korap/service/ResourceService.java b/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
index 6bfb1af..3098fc4 100644
--- a/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
+++ b/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;
 
 /**